tree 09a382c89d58ac170687b86f24f3ebc3f80698b6
parent d038809bdea16978b4a6b4009807153d0ac7e897
parent 5c3be09976fc3f3d000fc02aa93743aeaf8690d3
author Xin Li <delphij@google.com> 1562109152 -0700
committer android-build-merger <android-build-merger@google.com> 1562109152 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 6e67c53763
am: 5c3be09976 -s ours
am skip reason: subject contains skip directive

Change-Id: I77b2daaf56383c12d3e9ccadcf6bb18962e5a037