tree af8ec439dffacd36f9de133f875ca068275f45c6
parent 718f8e7adbfbceeafbcb1e35812fd2a63a7217da
parent 5f2987a89be811730fe37d4f2c5aed3a2343a4ed
author Xin Li <delphij@google.com> 1646737426 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646737426 +0000

[automerger skipped] Merge Android 12L am: bac85d0348 -s ours am: 5f2987a89b -s ours

am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I2881c5cf413f745e6817f4dde07ec4c04ff033c7