Jeff Sharkey bcba21827c Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 ...

automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null

2015-01-08 01:03:49 +00:00

..

java

Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1

2015-01-08 01:03:49 +00:00

jni

am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"

2015-01-07 22:16:11 +00:00

res

Import translations. DO NOT MERGE

2015-01-07 08:58:27 -08:00

tests

am 93241de7: Merge "Remove a bitrotted test."

2014-12-18 02:40:10 +00:00