Paul Jensen bbfacbbc96 resolved conflicts for merge of 2813d5ba to mnc-dr-dev ...

Change-Id: I8b33797528f16596f0d350ad38458baa51fcacf6

2015-07-29 11:31:53 -04:00

..

java/android/net

resolved conflicts for merge of 2813d5ba to mnc-dr-dev

2015-07-29 11:31:53 -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

Fix use of reachable DNS server logic

2015-06-30 12:12:37 +09:00