tree 4610b0511acfe9e7498a5e2e29e865ec9055f3d0
parent 419a204638c1cfb941c35837f7b8636c0ab8ec1e
parent c3549480e903d22cada75ed34ac6b2ea2e5f92bb
author Joe Onorato <joeo@android.com> 1258672108 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258672108 -0800

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