tree 232eb3ec2c4a2fd5dde62f97fd5c9f419f9747d3
parent 919198646aaf53b14242014b953aedd2a3b4218d
parent e0ea57db49d53630e4e4db5637c331dcb75ac064
author Xin Li <delphij@google.com> 1562098715 -0700
committer android-build-merger <android-build-merger@google.com> 1562098715 -0700

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

Change-Id: I3536bdf1978d603a20346ec3065232f3af374f59