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 am: 67522a1c49

Browse Source

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

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

...

This commit is contained in:

Shaowei Shen

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

committed by Automerger Merge Worker

parent b35b33ffb6 67522a1c49

commit f10d2bc85f

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