tree a2813e16d834b8f0dfda50dcf0c5c1b6e7dd581e
parent 8c319c5244eec7007cfef7054da3c9e28faff4c9
parent bc8ad18f182d1b6b0051b0d10ca5d86b419b4eb6
author Xin Li <delphij@google.com> 1572556151 -0700
committer android-build-merger <android-build-merger@google.com> 1572556151 -0700

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

Change-Id: Ibed559afb18aacdd048d8391dd6963af7c40354d