am a14b4890: am a50d4508: Merge change I75481cb8 into eclair-mr2

Merge commit 'a14b4890b914971c01bf130697090e7e775aeab4'

* commit 'a14b4890b914971c01bf130697090e7e775aeab4':
  Check that the resolved activity is not in our package.