[automerger skipped] Merge "resolve merge conflicts of a754e678a7 to sc-v2-dev" into sc-v2-dev am: 3e86b02d55 -s ours

Browse Source

am skip reason: Merged-In I95a80b484516f634fa13347534810c7a51cecc8d with SHA-1 8bdb222a18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098711

Change-Id: I6c1a641c9573b6ad6e7105381a3b75905af6ded6

...

This commit is contained in:

TreeHugger Robot

2021-06-25 16:28:02 +00:00

committed by Automerger Merge Worker

parent e6d26322d1 3e86b02d55

commit 2aac103477

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