tree 28ce16b16a7e52db33e3f6e094e396893e0d2001
parent 9c82183ae7fb7dc4db787b8796c652a732b4d552
parent 522ebff9feeb91a2dadafe42d7d3b67227d622b2
author Xin Li <delphij@google.com> 1562106349 -0700
committer android-build-merger <android-build-merger@google.com> 1562106349 -0700

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

Change-Id: Id4d38605cd59ee4dfcc9d69516e41c5ce8e7ef32