tree b178584cd6074879284532ebf5f91db100ff119c
parent da75f2ec0eb16117bf8eb1b14bdbd447c9d4a3ba
parent 4906b12c57ac29c650efafef5d19706f9087579a
author Xin Li <delphij@google.com> 1562014758 +0000
committer Xin Li <delphij@google.com> 1562014758 +0000

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

Bug: 134405016
Change-Id: I3eebac6b2bb3626b7d3cc548e065bf8b96355237