OSDN Git Service

Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into...
authorWink Saville <wink@google.com>
Thu, 8 Aug 2013 22:06:21 +0000 (22:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Aug 2013 22:06:21 +0000 (22:06 +0000)
commit35152f13b3302dbcb43345458dd5b8b092e37320
tree6f33bcf85e5d24ae18fa10a9f075d223bc329fc9
parent5191b8599011c255936e3a3cacc052c03e57b772
parent42d4f08db2c15e1829c1fc5d1942cf029ab0895b
Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
core/java/android/net/CaptivePortalTracker.java
services/java/com/android/server/ConnectivityService.java