tree 10da860fcff71886af91d082e31f0e1917926848
parent 48a51882a7ad01883663a52484b8eca99193d28a
parent 8a3f1b6ba3e7b42c4ce02956195fa2017167a414
author Jan-Willem Maarse <maarse@google.com> 1422666468 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666468 +0000

am 8a3f1b6b: am 21116068: Merge "Ignore generic motion events if custom content doesn\'t allow scrolling" into ub-now-porkchop

* commit '8a3f1b6ba3e7b42c4ce02956195fa2017167a414':