[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one am: 60cdc0c439 am: 2f2edf7dc5 am: a8a2ba824c am: e978347f04 -s ours

Browse Source

am skip reason: subject contains skip directive

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

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

...

This commit is contained in:

shaoweishen

2022-05-12 13:39:48 +00:00

committed by Automerger Merge Worker

parent 02d448e990 e978347f04

commit 3664762f27

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