tree af4a96bbc5821c673a67c7b52ee486dc893af93a
parent 6b5cdc76df3efcada68e3fa1dd056d8b052d7857
parent 2ce397899c43493c43ca8b3c19b724dd50ab7aed
author Adam Powell <adamp@google.com> 1281058777 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281058777 -0700

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 '9093717985095913934c079abfa879049bd33ba5' into gingerbread

* commit '9093717985095913934c079abfa879049bd33ba5':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller