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