tree 35950b15531836715da1980005502ab50e5222b8
parent 6195fe55105405c5c63819a1f12d40d1fa7b8ba2
parent 6dd56ab1bec04be72d1630b065b701d0c5d2e4b8
author Xin Li <delphij@google.com> 1567978143 -0700
committer android-build-merger <android-build-merger@google.com> 1567978143 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 6dd56ab1be -s ours
am skip reason: change_id If379604dd96f6ffdd1fd3d4ed224f474eb8536b8 with SHA1 b5a1ca632e is in history

Change-Id: Ieb5aba3a6c1d7d44b024f1e0416aedd600875053