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