tree f7369afb99b4e5d51ae023f3aed7290846a32e4e
parent 3ca086775197961657a1b4a9f260d54c8a9f53fa
parent ac0c26af76045682dc4b8a58cdce3c2945971de3
author Xin Li <delphij@google.com> 1568225650 -0700
committer android-build-merger <android-build-merger@google.com> 1568225650 -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: ac0c26af76 -s ours
am skip reason: change_id Idc05da05ba506ef82c18bde571bc95171f0a7e2b with SHA1 38ed224625 is in history

Change-Id: I774242df0f4d6ddc01077de5166060063eb743d5