tree 4feed280ef92ce6138ffad1085ca964ee945f034
parent 88efb6e2cb74075ed3938978603ef70c901a1314
parent 985e5db8a7155d65b4458c4592264401a7f2bf2d
author Tracy Zhou <tracyzhou@google.com> 1592969341 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592969341 +0000

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

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

Change-Id: I5d2f1a6a678439b8e6666e464fe7bf232bc58f10