tree 160446d273549cc5ee04e2ead3e8175ae8685512
parent 5f897cbf7d271aa603ca107375bb8b7d03cf1df0
parent 5eb0896667d5d6f4a8209806aeae871ade1a57ac
author Xin Li <delphij@google.com> 1562097535 -0700
committer android-build-merger <android-build-merger@google.com> 1562097535 -0700

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 5eb0896667

Change-Id: I9212c7cc6d5e944bc63cb6dd4fb78dc3accd9c5b