tree d03995ff05f3e8b54fec41aaad5702556dfea977
parent eaf241da4790e9c18b44d06b9aa60304861171a2
parent 2bbde82613b2c91e4176a2db080a4db8d44d9b89
author Xin Li <delphij@google.com> 1567982958 -0700
committer android-build-merger <android-build-merger@google.com> 1567982958 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 2bbde82613 -s ours
am skip reason: change_id I2bc088c2ccc60d30189595604a90cd42ce9331c3 with SHA1 23f0734341 is in history

Change-Id: Iade885b78819d25fb89fb24f778c869c01c8120c