[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 260cab7892 -s ours am: 1b06528325 -s ours

am: d1f953fad8 -s ours
am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history

Change-Id: I45ce7f338e7b43ab807b8dc94084d91afe56c41a
This commit is contained in:
Xin Li 2019-09-08 17:33:31 -07:00 committed by android-build-merger
commit c8622732d8

Diff Content Not Available