Alice Yang 3fea64623b am be504401: Merge "Fix bug where existing account not pre-checked" into jb-dev ...

* commit 'be5044015212b82a6e530c4516004255fe245ebe':
  Fix bug where existing account not pre-checked

2012-05-31 17:11:58 -07:00

..

java

am be504401: Merge "Fix bug where existing account not pre-checked" into jb-dev

2012-05-31 17:11:58 -07:00

jni

Increase busy timeout.

2012-05-30 15:18:51 -07:00

res

am 69a1f6e6: Merge "Import translations. DO NOT MERGE" into jb-dev

2012-05-31 15:45:07 -07:00

tests

am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev

2012-05-17 11:20:21 -07:00