tree 28046dd631ccf121fc06482e067ba49dc44207b1
parent f1e44bdc9fcc92a4ca70488adbc7e2c294584986
parent a08509ac061ac6e6424f1886188a566f857d82f1
author Xin Li <delphij@google.com> 1567989280 -0700
committer android-build-merger <android-build-merger@google.com> 1567989280 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 4e6417a203 -s ours am: 7283d03472 -s ours
am: a08509ac06 -s ours
am skip reason: change_id I17ba1e731bd403ec39551ccbae7b7a614415844e with SHA1 e0f4c66701 is in history

Change-Id: Ic963cef390644d88613a27386267526d47653bb2