commit | 5ea7ea44a23d0ab81f24eb290840db10d766b122 | [log] [tgz] |
---|---|---|
author | Michael Wright <michaelwr@google.com> | Thu Jul 23 16:32:02 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 23 16:32:02 2015 +0000 |
tree | bcb0d1f18d3f63c548a4e91a83397af9763f90f2 | |
parent | e6406e3589fa490bfa435384d2a3a6ac678e08fd [diff] | |
parent | e6f6ad04ed1e0e73fc260a0100d5759a0456fdd6 [diff] |
Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev