tree f6d6bcee0c9080ba84279f45ea99528cc316e3ae
parent bd6b4aaf029df33e512612d7d2fbb4af9dce3f83
parent 297df67e282aafe80d9fd80ce74b31b1e007c6f4
author Xin Li <delphij@google.com> 1567982029 -0700
committer android-build-merger <android-build-merger@google.com> 1567982029 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 297df67e28 -s ours
am skip reason: change_id I7f92dfad9cb6bb2a5f618a9302d511891b0112be with SHA1 dbae23c582 is in history

Change-Id: I4ba34680583a01f5160c4207a162afb48d274196