tree 26d254df0e15e7e5332491f4d9fcc21b5d6aa3ed
parent ea12130cf03f1496ebc2ad1f8dd505f20f29369a
parent 4b5830afb67a91cc32c48b0dd9ba19137169599a
author Xin Li <delphij@google.com> 1562098598 -0700
committer android-build-merger <android-build-merger@google.com> 1562098598 -0700

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

Change-Id: I89b59ae62e36d37f51ddf31353459d2a540db1a5