| commit | 9202e49dc9adb03e0b2541011b511bd17c29c0cb | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Thu Jul 23 19:21:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 23 19:21:23 2015 +0000 |
| tree | 24f229db776a2971fa5167d8fe5ae813ca41ea0d | |
| parent | 7429480806f8687931e99ab1480b9943086c6a00 [diff] | |
| parent | 5ea7ea44a23d0ab81f24eb290840db10d766b122 [diff] |
am 5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev * commit '5ea7ea44a23d0ab81f24eb290840db10d766b122': DO NOT MERGE. Cancel touches as well as pointer gestures.