[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 309cb0811a -s ours am: dc59e8ef85 -s ours

am: 7a2ab62102 -s ours
am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb808791 is in history

Change-Id: If6b2ef482de51474ce11e2f67d07eb24071b3860
This commit is contained in:
Xin Li 2019-09-11 11:13:26 -07:00 committed by android-build-merger
commit 68cffd687b

Diff content is not available