tree b2920bd903b4d3460525bd8bc6cf2848df361130
parent 37030b0a5cbb72b57d77149921c089e64edf1805
parent 43b288631281619f545982b9ab09da40b27ced0c
author Xin Li <delphij@google.com> 1562014798 +0000
committer Xin Li <delphij@google.com> 1562014798 +0000

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

Bug: 134405016
Change-Id: Ieed3a8162dfa04d26cb39eeb7e46c1c9e65e40e0