tree 1f2e57c92604850a2352915e5cd07e242730be73
parent e4aaef8c13ed630ae44b84803ac59ad629f2c01e
parent 6070b987962faf4fbe7dba1e843c06cfcd063a17
author Xin Li <delphij@google.com> 1565809448 -0700
committer Xin Li <delphij@google.com> 1565809448 -0700

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

Bug: 134405016
Change-Id: I279b64afeef1fff82e47faf8a65da7e3454e9604