tree 579596ff00910ed12b021e35f901f418900d1b10
parent ffffaace41a9e8389bd7552558722290d8e10a70
parent 9a9a93f55195b842fc8b33b15019766d12e3fbb6
author Tony Wickham <twickham@google.com> 1622218032 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622218032 +0000

Merge changes I6bf48141,I77b7a2e4 into sc-v2-dev am: f262591ab0 am: 9a9a93f551

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

Change-Id: I6b222c6875a8916d7d198c85f4e998dc31fb8873