OSDN Git Service

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


Trivial merge