Calin Juravle 21c3666eff am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev ...

* commit 'ef0a7e8fdbf60d6e5cc5f274f94516c3077895e5':
  Use native brige only if we have a private data directory.

2014-10-29 22:50:39 +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:18:50 -07:00

tests

Treat optimistic addresses as global preferred.

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