tree ce106ed4e818084ae00836d08f9e916bf6659c90
parent 3d040cfaddb86b39be971ee1006b3107a228ba96
parent 79e81dd79931645e2547e1789105bbaeebb14627
author Tracy Zhou <tracyzhou@google.com> 1592968229 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592968229 +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: I6940533ed3d481c91133870923b6de406fd5ba2b