tree 0489dd28053697ba25b2d1279848c971aec88013
parent 45167d6030ba328545ee3c3bae8f7a3bb083e42d
parent bb1e047dd8c7fe6c765eca8e4d838145b64a2cc7
author Bill Lin <lbill@google.com> 1619579670 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1619579670 +0000

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