[automerger skipped] DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason am: 63e26b3c75 am: d9b9126bb5 -s ours

Browse Source

am skip reason: subject contains skip directive

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

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

...

This commit is contained in:

shaoweishen

2023-01-30 08:15:10 +00:00

committed by Automerger Merge Worker

parent f6fd68a5b4 d9b9126bb5

commit 97311e863a

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