tree 876b75a4e7c554246fa0cb942327b5c6a6ed7b34
parent 1cdff0cb4fe6712d63aa05ddf690deecc26bc3bc
parent cbba151c10357cd8a084b912abd39746ee34909e
author Kevin Rocard <krocard@google.com> 1642656958 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642656958 +0000

Merge "Refactor Ringtone.playFallbackRingtone" am: 2f56b3ab02 am: cbba151c10

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

Change-Id: I18f7b2d6f60e6757715ca2ba103d1cc87ed0d42a