tree 40c1a6046d970092de186f4e9311a0f3fc57a22a
parent 58d6237dae2f718246c5aab132ffda6714c9ba67
parent 2482a19429edd6a4052e6d7ffd4e485e66bf0aed
author TreeHugger Robot <treehugger-gerrit@google.com> 1626976558 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626976558 +0000

[automerger skipped] Merge "resolve merge conflicts of 46378eb881ab96b90a7a2922775ecceb184456c7 to sc-v2-dev" into sc-v2-dev am: f3a387d731 am: 2482a19429 -s ours

am skip reason: Merged-In Id49bae33438e10248bef05450d7e2c92c2140748 with SHA-1 2cc564c647 is already in history

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

Change-Id: I30f71ea6775d44742c5e0ac1f286129a30f4bf38