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

* commit '69a1f6e6a1259d18848d2172b6407fb0fe6f5bc6':
  Import translations. DO NOT MERGE

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

..

java

am 4a3a9685: Merge "Protect volumepanel slider creation from race condition." into jb-dev

2012-05-31 13:13:34 -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