am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1

* commit '25dad8eda13d70a2473cde735042d083a578fb48':
  Prevent intermediate scale updates from being sent to WebKit while zooming.