tree 18a8be84b208d2db5b62ddf3833d17e6fe2cc794
parent 5fa1d3535ea3e9c89ffcdfaaaf28a44c9373c0fc
parent 305a4a30d0f53dd00fa56f6c966bd3067aee4a9e
author TreeHugger Robot <treehugger-gerrit@google.com> 1622218019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622218019 +0000

Merge "resolve merge conflicts of af76459cc48590968328c934c550b01222e37c06 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 305a4a30d0

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

Change-Id: I86697548f381fd7f903adf1beb0aee1833905fcc