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