Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 3a5de57e authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to... 

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active" into tm-dev am: 67382ffe

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



Change-Id: I60895a1271806a39319035eecc26679247df5e9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99ac6352 67382ffe
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