tree ba06b479d8fb46c79a5876e2b7d76e7ba8f48dae
parent 10ae6d410861f2d3aad30195df42ddcd78bd39e4
parent 37ad83909a4b6e333db1d72727a9fca75a366bf0
author Tracy Zhou <tracyzhou@google.com> 1592970442 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592970442 +0000

Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev am: 79e81dd799 am: 985e5db8a7 am: 37ad83909a

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

Change-Id: I5735d04716219b62d060a171725516eb61202229