tree 25a7b067ae12f69ea130ad97d939ac9038e81f98
parent 8f621f209d2e63b95b27b779b933ab7c2dc916fd
parent 50a5d5da7e8e71fc13c19ee635fa3a83498c80cc
author Xin Li <delphij@google.com> 1572555670 -0700
committer android-build-merger <android-build-merger@google.com> 1572555670 -0700

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

Change-Id: I88fce7b65ac0028b8140f0d07844feca55325151