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