tree 33fb6bb1f185eeddab02346b820c0d331db006f4
parent 06119c9c6a20e07e8f4cd9c1469ea8dec16c061c
parent 19ce4e25868bec5fe4436d037c0882a18747afe9
author Tony Wickham <twickham@google.com> 1639500819 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639500819 +0000

Merge "Don't clobber in progress page transition in applyLoadPlan()" into sc-v2-dev am: 36e5f812d5 am: 19ce4e2586

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

Change-Id: I0a9facc24dd47b4463a0b3872b3bdef7eb94def0