tree 630e76424b806d77259ce7ba5e446c806dc8f010
parent 6304bb21f2acbf57977c3075c47ad5e0b3510bc4
parent a7d36a4257394d2e0c5a7a1f20a2083edb15362a
author Xin Li <delphij@google.com> 1567979067 -0700
committer android-build-merger <android-build-merger@google.com> 1567979067 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: a7d36a4257 -s ours
am skip reason: change_id I64a01331273216829533f69f4422036e5598a547 with SHA1 c12771af1e is in history

Change-Id: I5c4bd8739537963e42d2ecb041cab73e497f953a