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