am f9a1ff41: (-s ours) am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread

Merge commit 'f9a1ff4173fd366fb263f0d3cae71014404c4612'

* commit 'f9a1ff4173fd366fb263f0d3cae71014404c4612':
  Fix bug 2973252 - Make overscroll glow respect ifContentScrolls