tree b42f0a828680dbe21eed093d0cf9a794686a365d
parent 093a3073c7ab70f892cf7a36c515f263ea4e56b5
parent 857a9bf19ecc7fa20ed03edf6d785990be91a481
author Xin Li <delphij@google.com> 1562099048 -0700
committer android-build-merger <android-build-merger@google.com> 1562099048 -0700

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

Change-Id: I151f60719129726b86b7e16095e8f899ce74db57