am 4888c7da: am dc30d28b: Merge change I3656f7a3 into eclair

Merge commit '4888c7da45b356bfcff5a6564150ca95a0a0afcf' into eclair-mr2-plus-aosp

* commit '4888c7da45b356bfcff5a6564150ca95a0a0afcf':
  Honor the mInitialScale set on WebView. This was