tree aede9405e4fd7b10a070020daeef063e69baa0f4
parent 3ebae8de950e36d4bc359951705547642944554a
parent 17561f2af1dd2b9b33fb49af94095721ac8c1c69
author Bill Yi <byi@google.com> 1649445288 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649445288 +0000

[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours

am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: I41f86251536e6bdf4c1960d816eb4e82c31b9a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>