am 6fb81376: (-s ours) am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread

Merge commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186'

* commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186':
  DO NOT MERGE Integrate edge effects into WebView.