tree e256c86bccbda37c4960e1c4164ca5c9a91184d7
parent 641a5264d9565a0347c8b958a8c8c46ac85d6c96
parent 4117bb8201524f2623c5d4109bbb4d21adab99ac
author Xin Li <delphij@google.com> 1565915464 -0700
committer android-build-merger <android-build-merger@google.com> 1565915464 -0700

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

Change-Id: I7957f27fb7ab5f4e6c3fb5b8c18ccd731ed6a991