tree b84d29ebcb9f7d3a2bf2ebdacfcf076e6f50a614
parent 6576937ff165cfd8e2230cbeb40c6d783675c517
parent c9aa628d065eb08d6fa30f0ac21c6eca4cfbab75
author Jeff Brown <jeffbrown@google.com> 1424225828 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424225828 +0000

am c9aa628d: Cancel touch events when a low-level touch gesture occurs.

* commit 'c9aa628d065eb08d6fa30f0ac21c6eca4cfbab75':
  Cancel touch events when a low-level touch gesture occurs.