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.