tree e9124f9a4b705e936dbc84ae61795ed41af94681
parent 9bfc3b68b3fddd6433d62e5539793ee99fedbcba
parent 9e40dec4113d737ee38a33eaaa34d223727b51da
author Xin Li <delphij@google.com> 1562099971 -0700
committer android-build-merger <android-build-merger@google.com> 1562099971 -0700

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

Change-Id: Id956ddcf9894f0b4305b680bba9d2d18f84e0b89