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.