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