[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master

am: 38cf5bf32f -s ours
am skip reason: change_id I5a9a6dd645a962020d9e0064fbe38652a28770c4 with SHA1 5a76576146 is in history

Change-Id: Id7bc33ec5c2e932686bc82faa8e9c480ce595762
This commit is contained in:
Xin Li
2019-09-11 14:52:51 -07:00
committed by android-build-merger

Diff Content Not Available