tree 23b5f3d8bb8f53c25245ab2964581992b9f2db76
parent 270fa903efc672a239e4a7cd8c6457c66a66daf3
parent af80bdfa99de5152288d2f125732a087d3f95089
author Joe Onorato <joeo@android.com> 1258096911 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258096911 -0800

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