am 740aa4b2: am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could...
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 '740aa4b2' into gingerbread-plus-aosp
* commit '740aa4b2':
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller