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