tree c61d828952e2f72bc8f7df9b960fa475abb53c15
parent b64ba3de9ecea66bd77dca7de7a16888f4670ba2
parent 68e7f7bbca74a735107f53c17e45b1e356c824a5
author Xin Li <delphij@google.com> 1565917362 -0700
committer android-build-merger <android-build-merger@google.com> 1565917362 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 4717ca5721 -s ours am: f5d1330bac
am: 68e7f7bbca

Change-Id: I000dc0caa0d1e3e64f8e712ce42cb6db273a1e53