tree e8b2f120291be59a33af92a649ece25e350f9428
parent de63e899c3870eff622cf169bce61424c68cfe75
parent af2adcd71eabd7ecc5aca48ea7f9f10943f56d08
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592957243 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592957243 +0000

Merge "Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f am: 15816e2cb3" into rvc-d1-dev-plus-aosp am: ab0f8427ae am: af2adcd71e

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

Change-Id: I4b758c67c31b1be613b08b577c7e3aa71934ec64