Christopher Tate d6c1126fab resolve merge conflicts of cffb19c to mnc-dev ...

am: 3f9ea2d386

Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251

2016-06-17 00:15:07 +00:00

..

java

resolve merge conflicts of cffb19c to mnc-dev

2016-06-17 00:15:07 +00:00

jni

Limit persistent ashmem backed fds to a minimum of 128kB.

2015-11-03 17:46:15 +00:00

res

Revert "Import translations. DO NOT MERGE"

2016-01-11 15:33:28 +00:00

tests

Fix check for caller being the active network scorer

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