[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make either transfer or expansion on a single route" into tm-dev am: 72fbb77539 -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: Ie0dbf9f22caeafd89061c976a3d10d47df3e171e

...

This commit is contained in:

Shaowei Shen

2022-03-22 02:20:59 +00:00

committed by Automerger Merge Worker

parent 7ce24bc371 72fbb77539

commit 83733ab081

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