tree fa9980169c3a61a355714df5f4a5f96a26944d62
parent 2a45dcec268fa1f7c272445f9e57d9f18f2d2734
parent 63e0b0d647875e832da13f603ecbe02f3e1f1e86
author Adam Powell <adamp@google.com> 1281059089 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281059089 -0700

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 '740aa4b2865a20700254314158bcb685514b2ac2' into gingerbread-plus-aosp

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