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