tree 0d48d95ab93a66e48389e984a87cb5d05720a93a
parent 5f2987a89be811730fe37d4f2c5aed3a2343a4ed
parent 3a9bb04f9380acab68db421426ac9a59158e5b66
author Xin Li <delphij@google.com> 1646734901 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734901 +0000

[automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -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: I78e022b6fdbf96e31a7dd36ba6b2b68536b3906f