tree f6d6bcee0c9080ba84279f45ea99528cc316e3ae
parent 40a4ebe593fcbcb1b73e588dcf36034f45f729b8
parent 4e27a93780f499b9cf476415603491751c8c421b
author Xin Li <delphij@google.com> 1567984999 -0700
committer android-build-merger <android-build-merger@google.com> 1567984999 -0700

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

Change-Id: Ife9bebf6254e5eb607c90831e8229e32316baf27