am bca63d4c: am b6341e9e: Fix launcher crash

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

* commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d':
  Fix launcher crash