Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable" into tm-dev am: 4fccafd334 am: e69587c839 am: c23ec45b18

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

2022-05-09 20:40:50 +00:00

committed by Automerger Merge Worker

parent 2a2b3b0439 c23ec45b18

commit a7e47cbb75

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