Wink Saville 7a4fb7376b am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2 ...

Merge commit '595c40920f31ba7b6674eb341548173e2aaf6ea7'

* commit '595c40920f31ba7b6674eb341548173e2aaf6ea7':
  Implement a HierarchicalStateMachine

2009-12-11 01:40:43 -08:00

..

config

…

java

am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2

2009-12-11 01:40:43 -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