From: Mehdi Alizadeh <mett@google.com>
Date: Thu, 10 May 2018 03:09:15 +0000 (-0700)
Subject: Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85833473e1;p=android-x86%2Fpackages-apps-Settings.git

Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
am: 3167f72961

Change-Id: Iac284f04b0ba862064ea5d2822819eaf31dcb4c0
---

85833473e1cf624baf9c7bd4b5cd13ae4861a319