| commit | c2fa26c0f5e6690efb9e99c88ffbb5064b816132 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Wed Sep 23 16:53:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 16:53:27 2015 +0000 |
| tree | 7ed4e7b8654a1d08bbffa1a88ad75832a75f0386 | |
| parent | d37734a4871013d067a033914579281bf5d1c13a [diff] | |
| parent | bc16fb988748f8870ff20afaf806f503ca960a6d [diff] |
am bc16fb98: am cff01363: Merge commit \'8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix * commit 'bc16fb988748f8870ff20afaf806f503ca960a6d': DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"