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.
tree: 66a338a3b41b72794318ca9f6ed285f702491b5e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE