tree 60eb05f2e88de4fce5c0d1574244d042b1357998
parent 46d10e2e12ae80ab712d8067565eaab0841daf95
parent bd6e32c578a211aa4ed9e1fea531ceb0e49dc882
author Xin Li <delphij@google.com> 1567983714 -0700
committer android-build-merger <android-build-merger@google.com> 1567983714 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b0e3446028 -s ours
am: bd6e32c578 -s ours
am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history

Change-Id: Icef0efbb3fea71bc4060609783c414995c59b927