tree 3d005e580ced64b03d4af3f9c9274b33f70ea829
parent d59b6d781aea273c92cc2256e590f1c8d459dd82
parent ce9134c982dbea703e78251459e0f3d0aafae1f0
author Winson Chung <winsonc@google.com> 1618978100 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618978100 +0000

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

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

Change-Id: I76eb94bd8f69585a64804be0564ad143f93121ea