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

am: 6e4ebc8b30 -s ours
am skip reason: change_id Id59b59f4e91e6f7e140bd74863345a51d7f8feef with SHA1 d4372873b6 is in history

Change-Id: I7e91e3e9425ffa3ac93d566dde269085dd2a8a32
This commit is contained in:
Xin Li 2019-09-08 14:32:04 -07:00 committed by android-build-merger
commit 589cea9c4c

Diff content is not available