tree 4610b0511acfe9e7498a5e2e29e865ec9055f3d0
parent 920beea4547a199a882894eb511ff4d7d85c0c87
parent cc19a53d6149491e58d2c2a749345a70b7492ec8
author Joe Onorato <joeo@android.com> 1258671441 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258671441 -0800

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

Merge commit 'cc19a53d6149491e58d2c2a749345a70b7492ec8' into eclair-mr2

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