tree f0bf9aa4d19b06e07fcf4f44a5574a69bba800b3
parent 349ddc180b51a32dc1e265fc64db5bfee50f73bb
parent a594709f82fa5d01d3cb3d17ba90ead898bfcf2a
author TreeHugger Robot <treehugger-gerrit@google.com> 1623952504 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623952504 +0000

[automerger skipped] Merge "resolve merge conflicts of fdd4cb3c390bb84d2ab2a1562812231610913a7f to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: a594709f82 -s ours

am skip reason: Merged-In I48e3f6a20c27c8c7aeef5da7a464a6c4a5e4180c with SHA-1 b94b6e0d3c is already in history

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

Change-Id: Icebc6bf84a45bf88fdf39296f2d6ab16849557fe