tree b516ef5077a63f6a51b9057c7954023e53a2b560
parent aec2d656bc38d469bb6cafba35ccd836dd240d7c
parent a0e4d043a1c003754902ade0e3521b35ff8d17cf
author Winson Chung <winsonc@google.com> 1621041867 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621041867 +0000

Merge changes I69baed7b,I38a1da16 into sc-dev am: ce9134c982 am: a0e4d043a1

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

Change-Id: I23ae34a3e8a910e3646078c7fa888b767bd573e4