am 504b5a04: am 418928e9: Fix bug 2223769 - Uninstalling app causes NPE.

Merge commit '504b5a0488f2efb0abbfc68c89ea73119ca3e925' into eclair-mr2-plus-aosp

* commit '504b5a0488f2efb0abbfc68c89ea73119ca3e925':
  Fix bug 2223769 - Uninstalling app causes NPE.
tree: 8d66158e0bca6d4cef5751e88c72303a38d0d183
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE