tree b516ef5077a63f6a51b9057c7954023e53a2b560
parent 8a568b6abfef562ed4c3b0a33805b62a30d52983
parent a298a11025ba120680f4e43f31200e51ff0c02c2
author Bill Lin <lbill@google.com> 1621044601 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621044601 +0000

Merge "Revert "Revert "2/ Resolve gesture one handed conflicts swipe up..."" into sc-dev am: 0bcfe825fc am: a298a11025

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

Change-Id: I83cebf1984fe020db6da51a8c3ea92cf614eb713