tree 2939b610e453fb7a21774f749f7012c29622e940
parent 8bdad60dda5ce8fe5ffd6b6bec69ff5008cdd454
parent 6de1929161c4898b95a8b298bd3c9403fbbf00e2
author Xin Li <delphij@google.com> 1562014794 +0000
committer Xin Li <delphij@google.com> 1562014794 +0000

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

Bug: 134405016
Change-Id: I63b5e97a7f3a893ccf9bfe15694d3f3f459bf8f5