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