tree 61bc1dd7bfab096ba3af55084fa6c4193e99ec48
parent 01409f7ae47bda458144a5805bfd2c22202d7b72
parent 532e95628b24f9590d3cc3442d09efb9bff2067f
author Brian Attwell <brianattwell@google.com> 1411505984 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411505984 +0000

am 532e9562: Merge "Improve scrolling, handle onNestedPreFling" into lmp-dev

* commit '532e95628b24f9590d3cc3442d09efb9bff2067f':
  Improve scrolling, handle onNestedPreFling