tree 2a36474f6d80275c5018fedc76d902245a8bbdd3
parent 21d11190702ad7241e292335aef772f11573e4a2
parent 942aeb2c4c137ec66995fa864df175fe403413c1
author Xin Li <delphij@google.com> 1568238953 -0700
committer android-build-merger <android-build-merger@google.com> 1568238953 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 923156a720 -s ours
am: 942aeb2c4c -s ours
am skip reason: change_id I157ff596deb419a57eca32a9b8d954d76294f627 with SHA1 ecb37ee845 is in history

Change-Id: Iea5018b78e870b8667b25b79029f928077172d74