am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll...
am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Merge commit '106950f2' into gingerbread-plus-aosp
* commit '106950f2':
DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.