tree ca733a5de79bdd95f2da40186474eab3570fa1a6
parent 149e316a458fc8564826e86c009f125caa319f6d
parent 7a051caedfe620bf590741053be4913cd8508751
author Xin Li <delphij@google.com> 1572475006 -0700
committer android-build-merger <android-build-merger@google.com> 1572475006 -0700

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

Change-Id: I9677219caef8f9515a935e6b535c5c950cb41751