tree 20cf35e2dda21c31094808d9ef622566016c7195
parent b68bc6e2519b16a2f83f93ed23566b46520faadf
parent 7a51fbbfb55c30921f0677b84483ef030e397d6f
author Joe Onorato <joeo@android.com> 1258681446 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258681446 -0800

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

Merge commit '7a51fbbfb55c30921f0677b84483ef030e397d6f'

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