Calin Juravle ef0a7e8fdb Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev

2014-10-29 15:48:12 +00:00

..

java

Merge "Reveal notification listener settings APIs." into lmp-mr1-dev

2014-10-29 14:54:18 +00:00

jni

Use native brige only if we have a private data directory.

2014-10-29 13:17:54 +00:00

res

Import translations. DO NOT MERGE

2014-10-29 06:14:09 -07:00

tests

Treat optimistic addresses as global preferred.

2014-10-29 19:11:58 +09:00