Paul Jensen 4f74dbe114 resolved conflicts for merge of f5b01767 to mnc-dr-dev ...

Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de

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

..

java/android/net

resolved conflicts for merge of f5b01767 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

Fix use of reachable DNS server logic

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