am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has...
am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev
automerge: 35261e41
* commit '35261e41':
Don't update OverScroller fling state if no time has passed since start