tree 2736e2cc6ced3641ee8f62622f8f6adad8f1aa8d
parent e98cd0cfd8393b606820efa1ccd964a8e16a1104
parent a9bb9394a51524f315b0464d2ac32bcbf44eec50
author Jonathan Miranda <jonmiranda@google.com> 1614714509 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614714509 +0000

Merge "More grid changes, closer to final specs." into sc-dev am: a9bb9394a5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38d9ea6f51535419d89c1484b6cc4df2c0b6976e