OSDN Git Service

Merge changes Ia15f77e2,Icaa1f95c am: c923752929 am: 8e5ebd9261
authorHugo Benichi <hugobenichi@google.com>
Thu, 13 Apr 2017 10:10:27 +0000 (10:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 10:10:27 +0000 (10:10 +0000)
commit54e288cc6ddac7d6c29223f71dfe1e003e1e930c
treedd05d7af516c2f1b3d82dba80f5161f77ef671d4
parent152c9cf703bb0f4ac7133761f744f8604e4f97fa
parentb98eee1f788adb62ce9e2cdc024c96ed076e3a4a
Merge changes Ia15f77e2,Icaa1f95c am: c923752929 am: 8e5ebd9261
am: b98eee1f78

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