tree 4feed280ef92ce6138ffad1085ca964ee945f034
parent 8b30e3c1fdf5ff7f400502ab8bd77dc5ecb65bb5
parent 79e81dd79931645e2547e1789105bbaeebb14627
author Tracy Zhou <tracyzhou@google.com> 1592968257 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592968257 +0000

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

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

Change-Id: Ifb0313c35f6721b88197ddf80cb61231cdc63140