tree 59ef4e3d9de2a54dbeeac281d763632ada17becb
parent 61d51f3c2b68a946011482d85142e05aaf0bb073
parent 9109e43f021bab95e32c1ccfea2f93b847594664
author Jeremy Sim <jeremysim@google.com> 1712869895 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712869895 +0000

[automerger skipped] Allow app pairs in folders am: 9109e43f02 -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: I7ca6356bad0272fc4f18c8c48a19f8ccfcab21f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>