Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 040906cf authored by shaoweishen's avatar shaoweishen Committed by Automerger Merge Worker
Browse files

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher]...

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable am: ec0d7f51 am: c2d76add -s ours

am skip reason: subject contains skip directive

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



Change-Id: I4daa402a1fc456513cf9217c9750e907122ec9ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57067218 c2d76add
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment