DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active am: dc6a2b9129 am: 24c0a151eb am: cf6e465a6b

Browse Source

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

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

...

This commit is contained in:

shaoweishen

2022-05-09 21:52:30 +00:00

committed by Automerger Merge Worker

parent 7c01aef3a8 cf6e465a6b

commit b35b33ffb6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available