tree 308c89acc5edb2eaee3419fde6c06a30eff03b31
parent d40fc4b6efc247b3393452d525a9a2a340997b44
parent c5402f8d8280ed1a5d33a486d0d025d29200e26a
author Bill Yi <byi@google.com> 1649447842 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649447842 +0000

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours am: 3ebae8de95 -s ours am: c5402f8d82 -s ours

am skip reason: subject contains skip directive

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

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