tree 2c194e2d7766334d6ec4e83384981c09c3972f46
parent 2ed25e355505b552c20e28b93f9ef273b2f83e0d
parent e84b3a6c3bc64771dfcc17672c2d8f5b469c5e5a
author Xin Li <delphij@google.com> 1633655977 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655977 +0000

[automerger skipped] Merge "Merge Android 12" am: e84b3a6c3b -s ours

am skip reason: Merged-In I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e with SHA-1 183bca2dcc is already in history

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

Change-Id: Ib3e5de38322b643b0974840b4c2d33565eba0988