[automerger skipped] RingtoneManager: verify default ringtone is audio am: a67982c990 -s ours am: b2a9729e29 -s ours am: 59a5af97d2 -s ours am: 1feffa4630 -s ours am: 1b0a6d9408 -s ours am: 70646bc8ac -s ours
am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 30c9b4efb9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027119
Change-Id: Ic7f43a8e6de8f749e7ec738233b1b4959756863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: