Skip to content
Commit 1c9f5069 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "MediaPlayer will now transition the background... 

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

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

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



Change-Id: I86a439decb07e7e2979fb7728d43bd47c91b4140
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 382b7c8b 03b55f7f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment