Dan Sandler 415c6cb235 am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev ...

* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
  "I tried to think of the most harmless thing."

2015-08-16 02:36:17 +00:00

..

java

am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 02:36:17 +00:00

jni

am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

2015-08-12 10:39:13 +00:00

res

am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 02:36:17 +00:00

tests

Fix check for caller being the active network scorer

2015-08-06 12:53:59 -07:00