tree 308c89acc5edb2eaee3419fde6c06a30eff03b31
parent 051356e03d33317921437614da77bbac2865533a
parent 46e166e78c7109c2475836a3517a4f7f1ac1cf37
author Bill Yi <byi@google.com> 1649450048 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649450048 +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: 46e166e78c -s ours

am skip reason: subject contains skip directive

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

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