tree a4c204d7b0fd2aa592f745bcbc80d7450b069d3f
parent ab1af19091f471121e45db7ab21cdf07587c8e94
parent d4b102dbc55173ca695d5093b3c9242e1bdb4d11
author Jonathan Miranda <jonmiranda@google.com> 1627090112 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627090112 +0000

Merge "resolve merge conflicts of 2e8356ba6451008b1a6317072a8b7a28960af158 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: d4b102dbc5

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

Change-Id: I0fc03a187a9b7a1486879ebe43e40d70788df8c8