tree e8b2f120291be59a33af92a649ece25e350f9428
parent ec615a46f70467032c765fe43a2a79e110ce01df
parent 37bdb08a45933f25653e408a05c06093bfe0841f
author Tracy Zhou <tracyzhou@google.com> 1592957171 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592957171 +0000

Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f am: 15816e2cb3 am: 22395f0f02 am: 37bdb08a45

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

Change-Id: I9b91f1c0835daa9068cf3059b891f78e43d45269