tree 3b259c11ebeffd15678963ad107273dae64bdae7
parent 7f4e761fac10e78a39b3a1b6ec4e990d8bd3b703
parent 263d1963873f66a8075c5b5b79598155281b08d8
author Xin Li <delphij@google.com> 1565917535 -0700
committer android-build-merger <android-build-merger@google.com> 1565917535 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 5487e82df5 -s ours am: 4117bb8201
am: 263d196387

Change-Id: I6f6482af0bc76e0006aabb08eb3f514588e3c390