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)
commitad0db31c695b45a9ba18ff653ce59b40ae36756a
tree24f229db776a2971fa5167d8fe5ae813ca41ea0d
parent5a02de8bcca99ba5edd710eca921ad0317fe54c1
parent9202e49dc9adb03e0b2541011b511bd17c29c0cb
am 9202e49d: am 5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev

* commit '9202e49dc9adb03e0b2541011b511bd17c29c0cb':
  DO NOT MERGE. Cancel touches as well as pointer gestures.