tree 47c54fbfe43066a80f92920f36b22bcc7120255f
parent 0e686c312264c9c4d3c6874d769b25654c8e0c65
parent cc30821f4245fcc2a8168e8b49cb066c651a13fa
author Xin Li <delphij@google.com> 1572470668 -0700
committer android-build-merger <android-build-merger@google.com> 1572470668 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7ed71f197c
am: cc30821f42 -s ours
am skip reason: subject contains skip directive

Change-Id: If9d4edb008827ba6de3b8d9aed9bb77708a338b6