tree 75a30c0deb69ebcdc54da2c5212638eaad3c6e4a
parent 45f12182071e6af1d862b10715d84d80af56d5e3
parent ab0f8427ae66c03b5d8afe45072216112aa45ac4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592956509 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592956509 +0000

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

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

Change-Id: Ic308d892af0da301a3e704df6f1c101eec158979