tree 3101262646a795281f17eab18a4711c175b6d093
parent 84c82ba64062efec2eb4039d1ffa8cd8c37a88b0
parent e4372a530f6ef65ecfceaf69fcb2367cdd928a25
author TreeHugger Robot <treehugger-gerrit@google.com> 1624638457 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624638457 +0000

[automerger skipped] Merge "resolve merge conflicts of ec551791ab153e49856e604a4069a9185d285a47 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: e4372a530f -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/+/15099330

Change-Id: Ic94318f86bc8d817b512aba1a56bb3bf465af4c4