Daniel Sandler 8dcda391c7 resolved conflicts for merge of 8ad3e817 to mnc-dr-dev ...

Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7

2015-08-15 00:03:09 -07:00

..

java

am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

2015-08-14 19:47:54 +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

resolved conflicts for merge of 8ad3e817 to mnc-dr-dev

2015-08-15 00:03:09 -07:00

tests

Fix check for caller being the active network scorer

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