tree 3101262646a795281f17eab18a4711c175b6d093
parent e565d6dbb0736eb268a0159ef6164b82c8571c69
parent 2aac1034776dbfd298ee5f038506a02a7901cf57
author TreeHugger Robot <treehugger-gerrit@google.com> 1624638527 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624638527 +0000

[automerger skipped] Merge "resolve merge conflicts of a754e678a7a2fddfa716783f8c5f2fc99da68973 to sc-v2-dev" into sc-v2-dev am: 3e86b02d55 -s ours am: 2aac103477 -s ours

am skip reason: Merged-In I95a80b484516f634fa13347534810c7a51cecc8d with SHA-1 8bdb222a18 is already in history

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

Change-Id: I63dcd445a24d61d05cf2ccdeb585055bb1c68df7