tree 68d7c133122d431abd1002320cde1ce888a36e59
parent ad5e768b95ab24c9302f875c4ec0742064cb116f
parent dae66c91b98114ff7aff993d521da984e834f4a0
author Jorim Jaggi <jjaggi@google.com> 1433990081 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433990081 +0000

am dae66c91: am c5ea150e: am ae7c2570: Merge "Disable swipe-up gesture to invoke assist" into mnc-dev

* commit 'dae66c91b98114ff7aff993d521da984e834f4a0':
  Disable swipe-up gesture to invoke assist