tree 61bc1dd7bfab096ba3af55084fa6c4193e99ec48
parent 966ae7552280609d38d3ac4c7a9a3acafc0ec4c4
parent 9e95e4e346df8bdf8aa675a21bfb3f42074dca45
author Brian Attwell <brianattwell@google.com> 1411507118 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411507118 +0000

am 9e95e4e3: am 6137dcf7: am 532e9562: Merge "Improve scrolling, handle onNestedPreFling" into lmp-dev

* commit '9e95e4e346df8bdf8aa675a21bfb3f42074dca45':
  Improve scrolling, handle onNestedPreFling