OSDN Git Service

am 5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gesture...
authorMichael Wright <michaelwr@google.com>
Thu, 23 Jul 2015 19:21:23 +0000 (19:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 19:21:23 +0000 (19:21 +0000)
* commit '5ea7ea44a23d0ab81f24eb290840db10d766b122':
  DO NOT MERGE. Cancel touches as well as pointer gestures.


Trivial merge