tree 45f6edf2611491a682e98a07268d5eb8efb65753
parent b3d620eaf4e78229412587e793715841610557aa
parent 0bcfe825fc27da5e3e60b34a9e6e9cf65720e969
author Bill Lin <lbill@google.com> 1619579794 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619579794 +0000

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

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

Change-Id: I82086290b99b9b7db6ff57ed8aca538717ef3fe2