tree 8df00446c980799ef3af0050d3c1c4cc5a1c88d3
parent 2e70689147fc961fa2cebd99c7dd6cfa5b557cf3
parent 63d55d82e77906d4a8a3901938b17b261876765f
author Xin Li <delphij@google.com> 1572470510 -0700
committer android-build-merger <android-build-merger@google.com> 1572470510 -0700

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

Change-Id: I414c226e399c98a87c0cfcab560148b9c5db796b