OSDN Git Service

Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks...
authorPaul Jensen <pauljensen@google.com>
Fri, 10 Jul 2015 14:57:09 +0000 (14:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 10 Jul 2015 14:57:13 +0000 (14:57 +0000)
commit00c64f7ca5b05384dc3c208eff43e0b1a037a7d0
tree0ab3e5e368f50e23bfb2d17a9c77c06b45f519fe
parent9613e9b76410b15b7f2700080a17476bf9f3461c
parent49e3edff5156f471819e4ea2a88994bca70bd870
Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
api/current.txt
api/system-current.txt
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java