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
tree: 20cf35e2dda21c31094808d9ef622566016c7195
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE