tree e9124f9a4b705e936dbc84ae61795ed41af94681
parent e37a2bcfba124078f9b0f25163abe6c9ec0e112e
parent 428b467663ee84e312bd83473782da368052500d
author Xin Li <delphij@google.com> 1567981750 -0700
committer android-build-merger <android-build-merger@google.com> 1567981750 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 53cad795c9 -s ours
am: 428b467663 -s ours
am skip reason: change_id Idc05da05ba506ef82c18bde571bc95171f0a7e2b with SHA1 38ed224625 is in history

Change-Id: I7e09671f68e872a5ca923791bee33ce7aca61cb2