tree 5ef076ff13288b9ae795d4ecd211064deef30521
parent 382b7c8be143bfb0fcc0de7e2df53a7ebcb3d60b
parent 03b55f7fa7d29856d77bee8cdbb7b01d4f62d90a
author Hawkwood Glazier <jglazier@google.com> 1670457013 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670457013 +0000

[automerger skipped] Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e0d am: 03b55f7fa7 -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: I86a439decb07e7e2979fb7728d43bd47c91b4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>