tree b516ef5077a63f6a51b9057c7954023e53a2b560
parent 474e63e65ea7f6b5d92008e24ff4a9b92485f54b
parent c1fd2ab7c59a771a8903ab2cc8e406c81ce0a22b
author Bill Lin <lbill@google.com> 1621041929 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621041929 +0000

Merge "2/ Resolve gesture one handed conflicts swipe up recents" into sc-dev am: 54d69965bf am: c1fd2ab7c5

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

Change-Id: I135a666745b5c49b0cfa6cd50a213a3b8e973aa5