tree 79b722aeed26f1f71309a086d552a3b7ce24c1df
parent 64e6402b2a972ecac5d0138f937b8f13012d8790
parent 40df1d25c3273baea32bec70988d83c1d487f27f
author Xin Li <delphij@google.com> 1629229563 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229563 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b252da0e67 -s ours am: 40df1d25c3 -s ours

am skip reason: Merged-In Ic51ea9d199e6a072168365aeb7553203cd2c43c6 with SHA-1 4b3c24d0d3 is already in history

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

Change-Id: I465d518b6da275162f31420b2a52f5cf038387e0