Geoff Mendal ddf7e2dfc2 Merge "Import translations. DO NOT MERGE"

2014-11-26 20:16:57 +00:00

..

java

am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev

2014-11-26 19:42:19 +00:00

jni

am 1fae0991: am f67cc149: am 2657717f: Merge "We have POSIX clocks."

2014-11-25 23:35:47 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-11-26 20:16:57 +00:00

tests

am 6a53bd9d: am 69d28437: Merge "RRO tests: fix potential NPE"

2014-11-26 18:14:34 +00:00