tree 41ed15cd1f5a0d824d822792b98b6f9c6d83f2ac
parent efd15ca87b82e7bd15fae1eefb9f9f547de2e09c
parent adbc2c5b5e9ccaae54a307955f692867926beaba
author Lucas Dupin <dupin@google.com> 1629917818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629917818 +0000

[automerger skipped] Constrain scroll amount am: 6d7a006302 am: 3be13be63b -s ours am: adbc2c5b5e -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: Ia85e95e7c105fae059dd420ddb8b7dd064b20939