Patrick Scott aaeef5cc64 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.

2009-12-10 12:17:12 -08:00

..

config

…

java

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

2009-12-10 12:17:12 -08:00

jni

am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2

2009-12-10 07:05:18 -08:00

res

use a fixed value for public ID

2009-12-10 11:14:41 -08:00