OSDN Git Service

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b am: 2c856480a0 am: d0e5f1d280
authorHugo Benichi <hugobenichi@google.com>
Tue, 4 Jul 2017 09:54:57 +0000 (09:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 09:54:57 +0000 (09:54 +0000)
commitf3d973836552eb829005b34e0d9d658429612a60
tree2a7fc242fe5e3339126e443db1ab115a26c84334
parentf7913a5977e7a5e90af18e45ecc014b1b22badc2
parentad0e98f88127fea95b7b8320164a4efcc412e282
Merge changes I90c211dc,I4455f272 am: a0ff4efc8b am: 2c856480a0 am: d0e5f1d280
am: ad0e98f881

Change-Id: I8a07b60112df37a63804454b356b4838c3a24965
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java