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

Merge commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee' into eclair-mr2-plus-aosp

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base