Merge commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee' into eclair-mr2-plus-aosp * commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee': Check that the resolved activity is not in our package.
Merge commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee' into eclair-mr2-plus-aosp * commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee': Check that the resolved activity is not in our package.