tree 5debfad1f461e3bd12ab19f1546286f916e8ed37
parent 59e880b19d60590af4a2ac90f817b060ce5f0e06
parent 2afb02b41ebbb4680089c9daef120ac47590498b
author Xin Li <delphij@google.com> 1565818208 -0700
committer Xin Li <delphij@google.com> 1565818208 -0700

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

Bug: 134405016
Change-Id: I8d6e43e6bb6bd8048a3ff9754c818cab40f49f2a