[automerger skipped] Merge "resolve merge conflicts of b6347c9d48 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 72784deb3f -s ours

Browse Source

am skip reason: Merged-In Id49bae33438e10248bef05450d7e2c92c2140748 with SHA-1 2cc564c647 is already in history

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

Change-Id: I6b3ed00829f54146e65d2dc34ed2227720caf62c

...

This commit is contained in:

Jonathan Miranda

2021-07-22 20:22:57 +00:00

committed by Automerger Merge Worker

parent 85b38729a8 72784deb3f

commit c2ded769c6

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