tree 64bb2db2589b38de4eac41706c3fa537d30a1693
parent c360844cc403a56bea1d111198b7c43f18405777
parent 6bcc6900de8a141f746295f25666d1ff0aa61502
author Xin Li <delphij@google.com> 1567984893 -0700
committer android-build-merger <android-build-merger@google.com> 1567984893 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ef2b3d5d6f -s ours
am: 6bcc6900de -s ours
am skip reason: change_id I42a4c94dd4245b98af2b9cc37af38ffa60fb37ff with SHA1 10001fdfc0 is in history

Change-Id: Ib3ed61e8a38438b4cb00af635f9218babf13a72e