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

Merge commit '869228dadb0e537ce9138dc613c4cbc7e1aed1d3'

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