OSDN Git Service

am 21116068: Merge "Ignore generic motion events if custom content doesn\'t allow...
authorJan-Willem Maarse <maarse@google.com>
Wed, 20 Aug 2014 20:35:57 +0000 (20:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Aug 2014 20:35:57 +0000 (20:35 +0000)
* commit '2111606845bec8b40e8eb164c73c60f59c028014':
  Ignore generic motion events if custom content doesn't allow scrolling


Trivial merge