tree 41ed15cd1f5a0d824d822792b98b6f9c6d83f2ac
parent 4cd4815452edda346a9072f818c0d0d94f38de0d
parent 5be7c006dec0a758ff52a654b5ae20ae901a3241
author Lucas Dupin <dupin@google.com> 1629917829 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629917829 +0000

[automerger skipped] Constrain scroll amount am: 6d7a006302 -s ours am: 3d1143f833 -s ours am: 5be7c006de -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: I16f61cb5b63fc720103a0391350801fa4d08e0f0