tree aa5d76bed7ef2d11e78cdde0896e3b6113e947b9
parent bc8a9b94e03c467ebf08ef8dd973438ff367d837
parent d26bad51c2d7bb0a38da814ccb5cd09e856a13f8
author Joe Onorato <joeo@android.com> 1259929721 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259929721 -0800

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

Merge commit 'd26bad51c2d7bb0a38da814ccb5cd09e856a13f8'

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