commit | 8a3f1b6ba3e7b42c4ce02956195fa2017167a414 | [log] [tgz] |
---|---|---|
author | Jan-Willem Maarse <maarse@google.com> | Wed Aug 20 20:35:57 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 20 20:35:57 2014 +0000 |
tree | 75f529a8e386805963d9d59bf8bdf1c855677c0b | |
parent | 91402c8e3e291c2b87eb238b01a358a321043bcf [diff] | |
parent | 2111606845bec8b40e8eb164c73c60f59c028014 [diff] |
am 21116068: Merge "Ignore generic motion events if custom content doesn\'t allow scrolling" into ub-now-porkchop * commit '2111606845bec8b40e8eb164c73c60f59c028014': Ignore generic motion events if custom content doesn't allow scrolling