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.
This commit is contained in:
Michael Wright 2015-07-23 19:46:18 +00:00 committed by Android Git Automerger
commit ad0db31c69

Diff Content Not Available