Paul Jensen f2479b9d50 Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev

2015-07-10 14:57:13 +00:00

..

core/java/com/android/server

Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev

2015-07-10 14:57:13 +00:00

tests/servicestests

Disallow requesting networks with mutable NetworkCapabilities.

2015-06-23 14:13:10 -04:00