OSDN Git Service

Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5
authorHugo Benichi <hugobenichi@google.com>
Fri, 14 Apr 2017 07:07:46 +0000 (07:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 07:07:46 +0000 (07:07 +0000)
commit43cdbc943dd24367c625e99ad7868f56ed84426d
treea03153fa747bf549621d8ebdc7d8feeaf7547812
parent5cf511907d73b16b5e153b0c9a787312b48ffc55
parent4479901ff38f83326b5372a7861ed485e1c42ea3
Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5
am: 4479901ff3

Change-Id: I7d20b9f247a30920df1938b680e63bc1739e1fa9
core/java/android/provider/Settings.java
services/core/java/com/android/server/connectivity/NetworkMonitor.java