tree 3461060a1b209f7acf7168067dead661ce96b267
parent 0e898b59d8bcd7cf75ffb9cac1b83f00d2754ee4
parent 0c8e22b1d3dbcd4580db2a288af65fcca10cde1b
author Derek Sollenberger <djsollen@google.com> 1300472832 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300472832 -0700

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

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