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: Iac297ca4ebec8482f79b98b2ea3348c977882006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Shaowei Shen

2022-05-09 16:59:31 +00:00

committed by Automerger Merge Worker

parent 93fd6d9307 a686628188

commit 9c8686e655

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