tree 8b900e8c53d45064ce3497cc3a8f8e039fada23f
parent ff619ed700c3d8be23fbb25c5ef0bb06031d28e6
parent c0f21e1d3c348c6ab83c1d223e7c1c2d683412fb
author Michael Jurka <mikejurka@google.com> 1326832008 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326832008 -0800

am c0f21e1d: Merge "Fix occasional odd scrolling behavior"

* commit 'c0f21e1d3c348c6ab83c1d223e7c1c2d683412fb':
  Fix occasional odd scrolling behavior