tree 9136d3a6b24f5475795f409f51806bce881e971c
parent 2f9a23cc5398dc504d0afe009112575833338404
parent 90ef15920837e5e0fce70e5d6bfd7fe28c57ada2
author Jonathan Miranda <jonmiranda@google.com> 1623104932 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623104932 +0000

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

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

Change-Id: I132e5b40189d7c042440cf3401c4eb7e3d836c8c