Merge "resolve merge conflicts of 1491ec31c5 to sc-v2-dev" into sc-v2-dev am: 79d95df59d

Browse Source

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

Change-Id: Iee5a7b774c705f82e13e65839c30a576b1cc21b8

...

This commit is contained in:

Yogisha Dixit

2021-06-26 15:26:46 +00:00

committed by Automerger Merge Worker

parent 56073c3f6e 79d95df59d

commit ee61dbb13a

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