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

* commit '8a3f1b6ba3e7b42c4ce02956195fa2017167a414':
This commit is contained in:
Jan-Willem Maarse
2015-01-31 01:07:48 +00:00
committed by Android Git Automerger

Diff Content Not Available