tree a5af0fd0ac54b015ec9122a44f5b2f40cc34121a
parent ddd7c497b730ac6bb013a6f1f35df32c4bf7df3f
parent bca63d4c5b67dc80e1d02a878f0c66202608372d
author Joe Onorato <joeo@android.com> 1257181410 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257181410 -0800

am bca63d4c: am b6341e9e: Fix launcher crash

Merge commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d' into eclair-mr2-plus-aosp

* commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d':
  Fix launcher crash