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

am: 63d6022adb -s ours
am skip reason: change_id I8ab306d25c9201383704fd8dc5e1f0d91c89576b with SHA1 48b1f0aba0 is in history

Change-Id: I61e9b76944566d009f89d791b13f8966b6a4c165
This commit is contained in:
Xin Li
2019-09-08 15:05:13 -07:00
committed by android-build-merger

Diff Content Not Available