Elliott Hughes 830ed7c82f resolved conflicts for a884d81e to stage-aosp-master ...

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

2015-09-24 10:01:32 -07:00

..

java/android/net

Don't mark NetworkRequests restricted when they don't have restricted caps

2015-08-19 11:08:38 -04:00

jni

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

tests/coretests

Fix use of reachable DNS server logic

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