tree 32004465065b431a8ed1c140d25898dee2cee756
parent 6c8c7e7e4ac8e4d373bfba19b1ebb4d357d2ab6d
parent 22949537426caf80b6b38b8316e02581012f5f55
author Xin Li <delphij@google.com> 1562097689 -0700
committer android-build-merger <android-build-merger@google.com> 1562097689 -0700

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

Change-Id: Ide78e508d46fdd6ef883b1fb541ad8a86a1bf25c