tree d7a327351d285f7e75585a51539d1965d76f25eb
parent 91c71c955b312a8cc0bce15fddc2be374082c072
parent 4706e793a3e24e211244dc48a5049cb8f767c3e9
author Xin Li <delphij@google.com> 1572475001 -0700
committer android-build-merger <android-build-merger@google.com> 1572475001 -0700

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

Change-Id: Ia9d36994b2b1b6ec66154ede80cd0a6bd7b8c9f1