[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8ebe195fe8 -s ours am: b54c726ae1 -s ours

am: 5e5b69bc9b -s ours
am skip reason: change_id I4cd7a2af463ad33b1bdc7260434d5e1c04695ef8 with SHA1 ea14d495b1 is in history

Change-Id: I1ebc02cf466c734fda4c4f0100a1aa19ba004157
This commit is contained in:
Xin Li 2019-09-08 15:12:16 -07:00 • committed by android-build-merger
commit 60b7d34fe2

Diff content is not available