[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable am: ec0d7f51e5 am: 660c429c9f am: a177293b99 am: dc54b8c8f8 -s ours

Browse Source

am skip reason: subject contains skip directive

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

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

...

This commit is contained in:

shaoweishen

2022-05-10 02:59:18 +00:00

committed by Automerger Merge Worker

parent c1ec2a9cb7 dc54b8c8f8

commit 90995dff1b

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