tree 8e339cb19f246ee8c174eea2fc6038d7e27b01bd
parent de98c857ab0dc0a3c2642f898e2c3fdb3f4bc632
parent e6f5d2abb98a50501b62fd3834165b497c767b1c
author Xin Li <delphij@google.com> 1567983800 -0700
committer android-build-merger <android-build-merger@google.com> 1567983800 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d2b54ad01d -s ours
am: e6f5d2abb9 -s ours
am skip reason: change_id Ia5e3d32375c7e7228d46477e9269958d8f5fbdfc with SHA1 5fbddd27fc is in history

Change-Id: I03e10b252e0e10ca39529e4a459dcb2761a0d01c