tree fc254f1e1544f4b707b2014b85f7218dcac48441
parent 8532af0f29fd8e024071e66c543ca5bd581e4db5
parent 3ff8608d6f67a223e26a249af35423be1740d020
author Xin Li <delphij@google.com> 1562014716 +0000
committer Xin Li <delphij@google.com> 1562014716 +0000

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

Bug: 134405016
Change-Id: Ic49ed266f2c33c6b2d97d40d6a9fce03e6c67db2