am c3549480: am cc19a53d: Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via Activity#showDialog on CreateShortcut

Merge commit 'c3549480e903d22cada75ed34ac6b2ea2e5f92bb' into eclair-mr2-plus-aosp

* commit 'c3549480e903d22cada75ed34ac6b2ea2e5f92bb':
  Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via