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

Browse Source

am skip reason: subject contains skip directive

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

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

...

This commit is contained in:

shaoweishen

2022-05-10 03:26:17 +00:00

committed by Automerger Merge Worker

parent 767027e7de b35b33ffb6

commit 22cee9ddca

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