tree 66a338a3b41b72794318ca9f6ed285f702491b5e
parent 2b11db87cb716afb85593a4c1f32e07983f76f3d
parent b8139ab650b7b3661401bc0a175a148ca34eb4fa
author Joe Onorato <joeo@android.com> 1259887315 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259887315 -0800

am b8139ab6: am 7e4ed99e: Fix 2300792 - All apps zooming when you come back from an app.

Merge commit 'b8139ab650b7b3661401bc0a175a148ca34eb4fa' into eclair-mr2-plus-aosp

* commit 'b8139ab650b7b3661401bc0a175a148ca34eb4fa':
  Fix 2300792 - All apps zooming when you come back from an app.