tree 308c89acc5edb2eaee3419fde6c06a30eff03b31
parent 46e166e78c7109c2475836a3517a4f7f1ac1cf37
parent 903038031812a163e3c92117cb7aedcb736a2a3d
author Bill Yi <byi@google.com> 1649447861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649447861 +0000

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

am skip reason: subject contains skip directive

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

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