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

Browse Source

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

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

...

This commit is contained in:

Shaowei Shen

2022-05-09 20:22:19 +00:00

committed by Automerger Merge Worker

parent cf6e465a6b a686628188

commit 67522a1c49

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