tree cd9067cc879188b06f2f586a3dd06320dda766b1
parent 6bca8a3f9e8cd689c85a559dbc561ec6bd0cde1e
parent 31109a44cf45b095217f7327cf30b80271f2f3d4
author TreeHugger Robot <treehugger-gerrit@google.com> 1623778000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623778000 +0000

[automerger skipped] Merge "resolve merge conflicts of 32a0ea311513a9bc11e8bb30e4fc13d00b9bcd5b to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 31109a44cf -s ours

am skip reason: Merged-In Ia904b8b96301042c900e0589f33fc625c1c1148b with SHA-1 0750f03c96 is already in history

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

Change-Id: I9b52b8df9141ffc13a951401207dbfabe2ddc8e0