am 3c24aca5: Don\'t crash when adding a shortcut.

Merge commit '3c24aca5f597f2eb90e53dce450197e2f46c2305' into eclair-plus-aosp

* commit '3c24aca5f597f2eb90e53dce450197e2f46c2305':
  Don't crash when adding a shortcut.
tree: 7f2042e0127a8d31156d374bcc3953510b1c5bfd
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE