tree 95e707aad3a2b889c118effce8e02eebfe75b0ea
parent 636e58424b7055f809ac9cbadeb3aa0765682765
parent 263d1963873f66a8075c5b5b79598155281b08d8
author Xin Li <delphij@google.com> 1568005712 -0700
committer Xin Li <delphij@google.com> 1568005712 -0700

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: Ib65b2e0e55cd046797bf3d60ddcc2a7558553e3a
Merged-In: I157ff596deb419a57eca32a9b8d954d76294f627