tree 59ef4e3d9de2a54dbeeac281d763632ada17becb
parent af6aa2c03446f63c8a5c5e5cf512ed2a3c0e41a4
parent 559aeb2c45702e98acd9bfdff0b39a5b5df0018b
author Vinit Nayak <peanutbutter@google.com> 1712869898 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712869898 +0000

[automerger skipped] Merge "Allow app pairs in folders" into 24D1-dev am: 559aeb2c45 -s ours

am skip reason: Merged-In I73732fcaefbdc61bf6e02a5be365962b8bbc3e41 with SHA-1 a596f589c4 is already in history

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

Change-Id: Iddd6c4d87cae874ddcc0450c3448334fbe12e323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>