tree 58107a828765a545bb240e4ac69cc044ffadcd41
parent c430060e222eb0cae7f00eedc58d8b83f1cd44dd
parent e00c1d4a1cf6d084c1cfdc876a51cbd2b6643897
author Xin Li <delphij@google.com> 1562097955 -0700
committer android-build-merger <android-build-merger@google.com> 1562097955 -0700

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

Change-Id: I3a7250d38f87672dbb3e3c025e8c2a56606d738b