tree f7b891c8467f9f0961639df454b6405a19f21dca
parent 7148e9115cbdeae3060435fd29088eaeb8edc90b
parent 987f7168d54ef42542b9d03b589f0287fd6e15c7
author Adam Powell <adamp@google.com> 1414799763 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414799763 +0000

am 987f7168: am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev automerge: 35261e4

* commit '987f7168d54ef42542b9d03b589f0287fd6e15c7':
  Don't update OverScroller fling state if no time has passed since start