OSDN Git Service

Merge "Add configurable captive portal probes" into pi-dev
authorRemi NGUYEN VAN <reminv@google.com>
Wed, 23 May 2018 14:26:39 +0000 (14:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 23 May 2018 14:26:39 +0000 (14:26 +0000)
commit1f8f21af607b6a8449a509d8482f92a194fc1c99
treef203d17467c1248c2de61c68d73d4b14f5029f6d
parentc8494ab0d7e0692b38d8702f798a6f011f7c7734
parent8255c2d6c27363daa8bd92f7fcb3302682b9950a
Merge "Add configurable captive portal probes" into pi-dev
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java
services/core/java/com/android/server/connectivity/NetworkMonitor.java