[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 7b2e2fe15c -s ours

am: 5848abafed -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: If3ed050ac1769d28bfa64b21557c727e149bcaaa
This commit is contained in:
Xin Li 2019-09-11 15:58:29 -07:00 committed by android-build-merger
commit fdd973f54d

Diff content is not available