Jeff Davidson e4d29f75f1 Merge "Mark network score permission strings as untranslatable."

2014-05-13 18:17:28 +00:00

..

java

Merge "Resolving resources across users."

2014-05-13 17:17:18 +00:00

jni

More native interpolators

2014-05-12 16:42:02 -07:00

res

Merge "Mark network score permission strings as untranslatable."

2014-05-13 18:17:28 +00:00

tests

Replace LinkCapabilities with NetworkCapabilities

2014-05-12 16:52:56 -07:00