[automerger skipped] Merge "resolve merge conflicts of 11bf817e86 to sc-v2-dev" into sc-v2-dev am: ce4397aafe am: e6286866f5 -s ours

Browse Source

am skip reason: Merged-In I230c33d7e4e1871d8d702737c56c79ce46504b8f with SHA-1 5688010306 is already in history

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

Change-Id: I6bee1ace49a1726905cafb183042253e4db288d3

...

This commit is contained in:

Jonathan Miranda

2021-06-15 01:30:15 +00:00

committed by Automerger Merge Worker

parent b2d7730ef0 e6286866f5

commit c28756f05f

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