[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours am: 33869c086d -s ours am: 9dfa1ac9c0 -s ours am: 24ad8bf36f -s ours
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1473ba97defis in history Original change:12470012Change-Id: I8e5b1bb8c8b79d41190ec17d545916db2d6dda19
This commit is contained in:
commit
51aed09447