tree e491f2cabcc2d9d3b2791a97836695a9863dceb7
parent 8cc199db4e637ccc253ba356c983ab3564aa6092
parent 6801766784c752609fc4a63db9038e5f64db6453
author Joe Onorato <joeo@android.com> 1260560278 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260560278 -0800

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

Merge commit '6801766784c752609fc4a63db9038e5f64db6453'

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