am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page...
am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread
Merge commit 'baf56089'
* commit 'baf56089':
Never show overscroll if the page scrolls at all.