tree 28046dd631ccf121fc06482e067ba49dc44207b1
parent 1ca1fc01931bad50e378f8bb278c8177f29bd79e
parent 7283d034728d71fe3dcd912a61ca4135ad4dc6a2
author Xin Li <delphij@google.com> 1567984992 -0700
committer android-build-merger <android-build-merger@google.com> 1567984992 -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 skip reason: change_id I17ba1e731bd403ec39551ccbae7b7a614415844e with SHA1 e0f4c66701 is in history

Change-Id: I1cd0f5ec109f6863e435ff2bddf6489cdecedf57