tree 030c90c104fb1c60e72c75d2b41a5477e3d7c25b
parent c11d9e8cff9392ae3e968c255123e6f48e5cdad5
parent 18d07beef44f52f8c7cd6b508b2c69f2195a0932
author Alina Zaidi <alinazaidi@google.com> 1623359846 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623359846 +0000

Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: 18d07beef4

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

Change-Id: I721d24e08f6ddf2d9be73392d66f25daa3346d5b