tree 7f2042e0127a8d31156d374bcc3953510b1c5bfd
parent 4baee90d22f02b1f31dcc7bca3bb9ad7263539ad
parent 3c24aca5f597f2eb90e53dce450197e2f46c2305
author Joe Onorato <joeo@android.com> 1266615552 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266615552 -0800

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.