tree 1f2e57c92604850a2352915e5cd07e242730be73
parent 5354fe6333048a06af32d722a9f186349f0ed81c
parent 6070b987962faf4fbe7dba1e843c06cfcd063a17
author Xin Li <delphij@google.com> 1562092866 -0700
committer android-build-merger <android-build-merger@google.com> 1562092866 -0700

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

Change-Id: I6ff2fea77d5803aad99af129cee1ec7b92f14561