tree 8c710ff1e858429cc80ea381fa616b6e490e685d
parent 043a5da7d4c82425d495fbbf62a191db1f4592f5
parent 8a6692452b468c4177214ae98ee7c23f6488deaa
author Xin Li <delphij@google.com> 1562092422 -0700
committer android-build-merger <android-build-merger@google.com> 1562092422 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: a06dc09418 -s ours
am: 8a6692452b

Change-Id: I5a5edb135e7c5a674255272ee3d5dea3e8c02cb6