tree e256c86bccbda37c4960e1c4164ca5c9a91184d7
parent 957b8a1d35d750aea18116ee680d80d2c8d533d7
parent 923156a720c03084379e6ab62bf1cf196ebb5415
author Xin Li <delphij@google.com> 1568236098 -0700
committer android-build-merger <android-build-merger@google.com> 1568236098 -0700

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

Change-Id: I299877eaa8613b5c246f70fa73d0e9094d911799