[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into rvc-qpr-dev am: 6ce832b646 -s ours am: 53b2ef023e -s ours am: 71f02e796a -s ours am: 31f54e3cb4 -s ours am: 782296ba35 -s ours am: eedbce1496 -s ours am: 7002cbeac5 -s ours am: e1de1a6672 -s ours am: 3db8b72446 -s ours

am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 a67982c990 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027348

Change-Id: I37468a6388dcad484e198452d6f9050a1b79969e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-08 08:08:51 +00:00
committed by Automerger Merge Worker

Diff Content Not Available