Irfan Sheriff c12a244632 Merge "Use Map for DnsSd TXT record" into jb-dev

2012-05-09 16:37:11 -07:00

..

java

Merge "Use Map for DnsSd TXT record" into jb-dev

2012-05-09 16:37:11 -07:00

jni

Add callback hack to find out when to load system properties.

2012-05-09 14:53:20 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-dev

2012-05-09 16:24:20 -07:00

tests

Merge "Recover from Throwable in FileRotator, dump." into jb-dev

2012-05-09 14:36:40 -07:00