| commit | e284d0089947afda2ea8b27f4c7b628af1a3024a | [log] [tgz] |
|---|---|---|
| author | Jan-Willem Maarse <maarse@google.com> | Sat Jan 31 01:07:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:07:48 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 48a51882a7ad01883663a52484b8eca99193d28a [diff] | |
| parent | 8a3f1b6ba3e7b42c4ce02956195fa2017167a414 [diff] |
am 8a3f1b6b: am 21116068: Merge "Ignore generic motion events if custom content doesn\'t allow scrolling" into ub-now-porkchop * commit '8a3f1b6ba3e7b42c4ce02956195fa2017167a414':