tree dd7c4719842595ddb8ed6f0f10042a4fffe5f1a3
parent e1a71134e3227b43592b9699a716eba9c8669165
parent 68ba5ca5d7f17df65f0cc8813603de2d3f215bf4
author Joe Onorato <joeo@android.com> 1258064975 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258064975 -0800

am 68ba5ca5: Keep banging on the launcher locks up bug.  This moves the delayed zoom stuff into one place, so it should be out of sync less.

Merge commit '68ba5ca5d7f17df65f0cc8813603de2d3f215bf4' into eclair-mr2

* commit '68ba5ca5d7f17df65f0cc8813603de2d3f215bf4':
  Keep banging on the launcher locks up bug.  This moves the