tree 238d9b1cb79124cfcdb9e97567934fc2a749996e
parent 54b836c65a007380bfd3251b9ff98cfdc8ce4827
parent c30fcad11217ea16396e0fef76c2f728a1b5dd61
author Pierre Barbier de Reuille <pbdr@google.com> 1625162576 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625162576 +0000

[automerger skipped] Merge "resolve merge conflicts of 25e37a85aebe083fd56980086a4f81740088dc4d to sc-v2-dev" into sc-v2-dev am: 2fa6e35341 am: c30fcad112 -s ours

am skip reason: Merged-In If573641e4bb5a98ed6b5008e00f70f4bbe492c24 with SHA-1 2881801c7b is already in history

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

Change-Id: I66879d0e393dc1861a9da2af564e7a5bf7d5395c