tree 526a20c14700b4e8eef4ed2d4ab0f85fcd4fef90
parent 02168c41c444e4f601a2809d6d948e4b051b3a3e
parent 6d00151c519d5c131cc1480978fe4417cc7bcc79
author Dianne Hackborn <hackbod@google.com> 1273598335 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273598335 -0700

am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo

Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?