am a68a0ebb: (-s ours) am 740aa4b2: am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo

Merge commit 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d'

* commit 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller