tree 35950b15531836715da1980005502ab50e5222b8
parent e5015ba19e32ffad8787223324fad8d7a989d466
parent 7eab4ca834251c3a7184390824ec962ed7650ed0
author Xin Li <delphij@google.com> 1567979351 -0700
committer android-build-merger <android-build-merger@google.com> 1567979351 -0700

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

Change-Id: Id0a3575ae99d934cec40fcfb3dac50e8e65dfc77