tree 2ccfeac1fbd9c997023ee4637bcb65f0181066fd
parent c3a5df61882a29466f05e672cee354a864a96637
parent 2fa6e35341cb97aa14ab1ff7ed0509a01d0cc86f
author Pierre Barbier de Reuille <pbdr@google.com> 1625141237 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625141237 +0000

Merge "resolve merge conflicts of 25e37a85aebe083fd56980086a4f81740088dc4d to sc-v2-dev" into sc-v2-dev am: 2fa6e35341

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

Change-Id: I8f8a300762b17aa33422d3b3900231ce56bac674