| commit | edc1f196eaa53784208c574ece51fc5634f3820c | [log] [tgz] |
|---|---|---|
| author | Jan-Willem Maarse <maarse@google.com> | Sat Jan 31 06:21:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:21:43 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | 06034a966964e1f1be133d0f93759d2fd167ade0 [diff] | |
| parent | 0a2107266f03709b1859441cfa7fa2e7a31d2b52 [diff] |
am 0a210726: am e284d008: am 8a3f1b6b: am 21116068: Merge "Ignore generic motion events if custom content doesn\'t allow scrolling" into ub-now-porkchop * commit '0a2107266f03709b1859441cfa7fa2e7a31d2b52':