tree e9124f9a4b705e936dbc84ae61795ed41af94681
parent 3c26bb0f1b08828fb96cb96d52f6f1056e1279cf
parent 53cad795c9ba271e22828c52fd467a0a52b904ca
author Xin Li <delphij@google.com> 1567979179 -0700
committer android-build-merger <android-build-merger@google.com> 1567979179 -0700

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

Change-Id: Ia6b945a7bbc15579ae8ee9d656692235bbdba4be