tree 94b43941c9c13540679884303de7d999ef0a0abb
parent e21bbd24a107c3286e8c6f3eca069ebb12ef13da
parent 25dad8eda13d70a2473cde735042d083a578fb48
author Derek Sollenberger <djsollen@google.com> 1300472631 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300472631 -0700

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.