tree 7d97d74026f809bc4ff31ec35b4450ff35dc27d6
parent d3e20c94c53d6275559ea35d749135a14688f9a4
parent cc35cdd3b4d228a5664800cae7f03f993f8a98ba
author Xin Li <delphij@google.com> 1567978040 -0700
committer android-build-merger <android-build-merger@google.com> 1567978040 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: cc35cdd3b4 -s ours
am skip reason: change_id Ide45d9cbe2c437c140f6a756c8b9b04f13ec7a07 with SHA1 3b87006375 is in history

Change-Id: I030ff6635b836790ee7772f015da734d8f70f479