tree ba06b479d8fb46c79a5876e2b7d76e7ba8f48dae
parent 18575b5c7769fad55be99c559022995f08c61901
parent 6466fcf8dbce022004a39985abe2587908ef3ad8
author Tracy Zhou <tracyzhou@google.com> 1592970381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592970381 +0000

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

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

Change-Id: I2f8922d217cbd566e419cb978b25d0e8925df738