Fred Quintana 76eb1a2518 Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""

2011-09-12 12:17:54 -07:00

..

java

Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""

2011-09-12 12:17:54 -07:00

jni

Add error codes for channel disconnection / connection.

2011-09-08 15:26:53 -07:00

res

Merge "Import revised translations."

2011-09-12 10:22:21 -07:00

tests

Merge "Revert encryption mapping for device wipes."

2011-09-11 16:48:32 -07:00