tree c2dd21708cb30bef15efdb24e30b1ca9250658c9
parent 81edda7af60b302e96d6a8c9058f77966b281869
parent 3caed5ea5f55dede07741c1cf834e7c2a785865a
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: I8785a4f25a64218c7768ce4196c5c45ebeb9a2b4