am af80bdfa: am 010272d7: 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 'af80bdfa99de5152288d2f125732a087d3f95089'

* commit 'af80bdfa99de5152288d2f125732a087d3f95089':
  Keep banging on the launcher locks up bug.  This moves the
tree: 23b5f3d8bb8f53c25245ab2964581992b9f2db76
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE