am c6d83caf: am a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread

Merge commit 'c6d83cafed6e60223c28da328f845998e27bfae0'

* commit 'c6d83cafed6e60223c28da328f845998e27bfae0':
  Fix a bug that could cause flings to last too long using a Scroller