commit | 39145e783883e6288589559cedca85d414213e6d | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Thu Aug 05 18:46:57 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 05 18:46:57 2010 -0700 |
tree | 6d8db2ea573a837bf75850982e102a4d232851df | |
parent | 453d47657558e08db8e27bebeb0ce951e0f07b75 [diff] | |
parent | 348765d7c44e4f4dfd118bec5e54d78db191ac97 [diff] |
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 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d' * commit 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d': DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller