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 'a68a0ebb'
* commit 'a68a0ebb':
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller