tree 66a338a3b41b72794318ca9f6ed285f702491b5e
parent 3227072624ba6fcc73d5635067a021a4ad734c80
parent 7e4ed99eb075ebe3a7a10b852ae791bee5000e6e
author Joe Onorato <joeo@android.com> 1259881766 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259881766 -0800

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

Merge commit '7e4ed99eb075ebe3a7a10b852ae791bee5000e6e' into eclair-mr2

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