tree 68017bd5e11d46dd65570f94a3af040db0b6b45e
parent cc1865462b5b2a2870dcfb5d657d51e078c5fd4d
parent c0a44a9c7f6d2c7f2ef385eff6f93caf3ff7e9c9
author Alex Chau <alexchau@google.com> 1631039581 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631039581 +0000

[automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 32d872b840 -s ours am: 71e766dcea -s ours am: c0a44a9c7f -s ours

am skip reason: Merged-In I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a with SHA-1 06c7d0cb56 is already in history

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

Change-Id: I6af6f4551958ecc947c4f1c2f1ab95cab58dc251