tree 38eec5403ca9f05f178eab0446932356533f6c04
parent fdee69ef6f6ea333dd7c344cc50185ffd3b1708a
parent 39201d9d86303502944186db92c36e2428e15524
author Xin Li <delphij@google.com> 1567973210 -0700
committer Xin Li <delphij@google.com> 1567973210 -0700

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

Bug: 135460123
Change-Id: I579275c0fcfa15cfbb63970de459b681089e8a47
Merged-In: Id5785b498d8cc341cea8c4f7a69e6cd469fcbae2