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: a63152c62b

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

2022-05-09 21:03:09 +00:00

committed by Automerger Merge Worker

parent dc54b8c8f8 a63152c62b

commit d40c94b656

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