am 53fb09b4: (-s ours) am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread

Merge commit '53fb09b42f8862650f959c30c1ab104142fa873a'

* commit '53fb09b42f8862650f959c30c1ab104142fa873a':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.