am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo

Merge commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken

* commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0':
  Fix a WebView scrolling regression - bug 2633572.