tree 7634fa4d1e4629b492a8e06e8aadd7c677277972
parent 5d9dacc682b6cade694d0fc29c6951ede173c727
parent 15237db04c12c3bf193211a878aa69ea91e2052a
author Joe Onorato <joeo@android.com> 1260560132 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260560132 -0800

am 15237db0: am 8cf34293: Launcher2 - This might fix the missing app problem and the crash in removeApp.

Merge commit '15237db04c12c3bf193211a878aa69ea91e2052a' into eclair-mr2-plus-aosp

* commit '15237db04c12c3bf193211a878aa69ea91e2052a':
  Launcher2 - This might fix the missing app problem and the crash in removeApp.