Paul Jensen d973d21a45 am abd27102: am 41779e46: am 95297732: am 41027a92: resolved conflicts for merge of 32380993 to mnc-dr-dev ...

* commit 'abd27102f4e232be448bc6012e0bd833637ab3fa':
  Fix NOT_RESTRICTED network capability and enforce it.

2015-08-05 11:44:46 +00:00

..

java/android/net

resolved conflicts for merge of 32380993 to mnc-dr-dev

2015-08-05 07:07:24 -04:00

jni

Query HTTP proxy for network via a new API to avoid permissions exceptions

2015-05-18 17:05:51 +00:00

tests/coretests

Turn off failing tests in FrameworksCoreTests.

2015-07-31 18:13:30 -07:00