tree f9e0508ccea094b6bf46ee527bd57b7572394acb
parent 8b485fd9ae561d5079ededb2ec4b8021d370960d
parent 06452a427d1e2c24aaea68ee4f8cb60f602b9daa
author Alex Chau <alexchau@google.com> 1616673354 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616673354 +0000

Merge "Move numAllAppsColumns to displayOptions" into sc-dev am: 06452a427d

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

Change-Id: I8e1f123f3c1df8f2cd6a1ec9fb0110ea29b49f02