tree 630e76424b806d77259ce7ba5e446c806dc8f010
parent 73082b4302fc4c39c97596a39c3124391e227794
parent 071ab094c25e3625c096a866b3f3352deb56f965
author Xin Li <delphij@google.com> 1562099657 -0700
committer android-build-merger <android-build-merger@google.com> 1562099657 -0700

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

Change-Id: I62d685c3bfba7897e8753359e1a3d644c068c40c