tree e1d8d5c0fbaae4d36662c5c869d9c52bc4dc0aee
parent 542d81bf59d786582e815937f1d83bce00faf04b
parent 93c0cfadb1d756750f5cd5586e47339b1572bcd4
author Jonathan Miranda <jonmiranda@google.com> 1623103425 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623103425 +0000

Merge "New folder icon style (uncropped icons)." into sc-dev am: 93c0cfadb1

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

Change-Id: I2af08ae7e74165d9f71734d2a7b28960b421eb91