Merge "resolve merge conflicts of a2e4c36d1c to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 35205c1636

Browse Source

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

Change-Id: I63f2d1672ffb37bdcc9b2f598e0c681d32c9e484

...

This commit is contained in:

Yogisha Dixit

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

committed by Automerger Merge Worker

parent 06b7b3ead2 35205c1636

commit 432299d1ff

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