tree 382d575c21cf86d34e2f2b861b9adaf2225083f4
parent 36b889c12c0d4046b4a281a967d909eec7747ad4
parent 0fb01f7cf9c27f269e8fe7a3c2e5a14971d5a30d
author Xin Li <delphij@google.com> 1568242053 -0700
committer android-build-merger <android-build-merger@google.com> 1568242053 -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: 0fb01f7cf9 -s ours
am skip reason: change_id I157ff596deb419a57eca32a9b8d954d76294f627 with SHA1 ecb37ee845 is in history

Change-Id: Ifc6bb76e519332399a6e3fee63a461b632a6431d