am bca63d4c: am b6341e9e: Fix launcher crash

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

* commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d':
  Fix launcher crash
tree: a5af0fd0ac54b015ec9122a44f5b2f40cc34121a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE