tree 213529607a20bdb98c1d588f09c8b4e32f5353a4
parent e48e7c1a62e6a367803dca62c8fce9de57121b0f
parent 869228dadb0e537ce9138dc613c4cbc7e1aed1d3
author Joe Onorato <joeo@android.com> 1266615744 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266615744 -0800

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

Merge commit '869228dadb0e537ce9138dc613c4cbc7e1aed1d3'

* commit '869228dadb0e537ce9138dc613c4cbc7e1aed1d3':
  Don't crash when adding a shortcut.