OSDN Git Service

am cff01363: Merge commit \'8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
authorMichael Wright <michaelwr@google.com>
Wed, 23 Sep 2015 16:44:23 +0000 (16:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2015 16:44:23 +0000 (16:44 +0000)
* commit 'cff01363fcbdae5486287540e1f8917244aaea90':
  DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"


Trivial merge