tree 4feed280ef92ce6138ffad1085ca964ee945f034
parent 34f04fe1df39724066781951997dee1a55694585
parent 4853401c1c59dcc3067e1cdae19ab972a6ba5930
author Tracy Zhou <tracyzhou@google.com> 1592969237 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592969237 +0000

Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev am: 79e81dd799 am: 4853401c1c

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

Change-Id: Icb1b06adb01ccd051186f1f416f31c28865f3878