tree dd190909c13488e115cd9fad3e1d6101ca38321a
parent 46eaebba86b548a4cbc243b55e5fed62f72f0c41
parent 3be13be63b7ddf7074c24854b7854fdbebf93bec
author Lucas Dupin <dupin@google.com> 1629916738 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629916738 +0000

[automerger skipped] Constrain scroll amount am: 6d7a006302 am: 3be13be63b -s ours

am skip reason: Merged-In Ibf16fb72cf95e29ed820d5f511e764a388c93bb0 with SHA-1 b259a896f5 is already in history

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

Change-Id: Ic7e46b5818d99068896621a3377eef01b512f385