| commit | f3384adc68600df4af1375906717586eb2bc7407 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Wed Sep 23 19:50:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 19:50:30 2015 +0000 |
| tree | ad7c52b3bd8fc68f694269b79433e75d278beaac | |
| parent | 1ec0f48cbd44a56c360d075849655ab2c3f36476 [diff] | |
| parent | c2fa26c0f5e6690efb9e99c88ffbb5064b816132 [diff] |
am c2fa26c0: (-s ours) am bc16fb98: am cff01363: Merge commit \'8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix * commit 'c2fa26c0f5e6690efb9e99c88ffbb5064b816132': DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"