Xavier Ducrohet 009909b417 am b43b35a0: am e6547423: Merge change I10073d50 into eclair ...

Merge commit 'b43b35a034ad667ba749270537155e7534906153'

* commit 'b43b35a034ad667ba749270537155e7534906153':
  Add Annotation for optional features.

2009-12-16 12:19:52 -08:00

..

config

…

java

am b43b35a0: am e6547423: Merge change I10073d50 into eclair

2009-12-16 12:19:52 -08:00

jni

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

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

res

Cherry-picking c95b39d3 from eclair-mr2

2009-12-15 16:42:47 -08:00