tree 0d48d95ab93a66e48389e984a87cb5d05720a93a
parent 11a04548791f95d7a924714b7949b51155e8e07c
parent bac85d03483b51f717bbe8322566ef05e2e8a3c3
author Xin Li <delphij@google.com> 1646734735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734735 +0000

[automerger skipped] Merge Android 12L am: bac85d0348 -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: I4a23489651088697a78e911ea134bbdc34296bf6