tree e067af0dfbd7ece7e87f433097b99d736d5a6f6e
parent 4d60e5c3f8a3e6cc4ea217d03355bd040de813e7
parent 781da1352f944f3e613486f42dcd6cd4055b2386
author Pierre Barbier de Reuille <pbdr@google.com> 1625236342 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625236342 +0000

Merge changes Id2a8d12e,I06353ba4 into sc-dev am: 6788b73970 am: 781da1352f

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

Change-Id: Ibc2929fe39db48a541b22a01b5a0906ade450d33