tree 9645d78313ad26235e86636921097ed488421325
parent dba149b848da4a983f5ce06daaf74be2d5ecc8c1
parent 1c9f5069127d5bc52a7936a8bca0f6e2111c4bb7
author Hawkwood Glazier <jglazier@google.com> 1670457121 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670457121 +0000

[automerger skipped] Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e0d am: 03b55f7fa7 -s ours am: 1c9f506912 -s ours

am skip reason: Merged-In I963afcf4ba0fd8c2e9ebca4d634098f63454fab6 with SHA-1 90a5f092f1 is already in history

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

Change-Id: I5fe890b8c8292cddb1bc9c3ef2e5c3ad8a914a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>