| commit | dd28d991f20c2c24b698006ba4e5750a0629057f | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Thu Jul 23 20:09:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 23 20:09:44 2015 +0000 |
| tree | 01d7c93c6052ced9bb31e10710a9498ee41444e6 | |
| parent | b4a8ec9f3dc3b4a73ee35a900d5646cfc35b8b91 [diff] | |
| parent | ad0db31c695b45a9ba18ff653ce59b40ae36756a [diff] |
am ad0db31c: am 9202e49d: am 5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev * commit 'ad0db31c695b45a9ba18ff653ce59b40ae36756a': DO NOT MERGE. Cancel touches as well as pointer gestures.