tree 7fb5a322927a862efde77948b6f94382850688c9
parent 149f8d07547a9f0df26b3797948c032d4c333134
parent 69a1fd86d359fa14d4add9aff910663030685ca6
author Xin Li <delphij@google.com> 1568236518 -0700
committer android-build-merger <android-build-merger@google.com> 1568236518 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 69a1fd86d3 -s ours
am skip reason: change_id I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e with SHA1 e3b772e0f7 is in history

Change-Id: If121600192dd236e9b868d579459c566eaddbd69