[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make either transfer or expansion on a single route am: 6da04ce007 am: e587923222 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Ic8619a7d2fe2ad4f191503ff22fe5ccecb5b774d

...

This commit is contained in:

shaoweishen

2022-03-22 02:42:52 +00:00

committed by Automerger Merge Worker

parent 8b0d650007 e587923222

commit 9e6970b984

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