tree a842c5318236f5a7bc1cb65eda35c941ead26e9f
parent b2d7730ef016a8a8c9eb8b6db993ddec1d97259f
parent e6286866f56e9cc11c9015b06d3134a1c73f613c
author Jonathan Miranda <jonmiranda@google.com> 1623720615 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623720615 +0000

[automerger skipped] Merge "resolve merge conflicts of 11bf817e86c669e820d8a63fd82bad654f2203ab to sc-v2-dev" into sc-v2-dev am: ce4397aafe am: e6286866f5 -s ours

am skip reason: Merged-In I230c33d7e4e1871d8d702737c56c79ce46504b8f with SHA-1 5688010306 is already in history

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

Change-Id: I6bee1ace49a1726905cafb183042253e4db288d3