OSDN Git Service

Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
authorChalard Jean <jchalard@google.com>
Tue, 12 Jun 2018 13:57:33 +0000 (06:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jun 2018 13:57:33 +0000 (06:57 -0700)
commit85bae863f558ab6f10ea2d876ece8c720f9af686
tree23f24617bc3906936fd7b287fc2d3f7603593e4c
parent79d42a61e4c0832d8ec03da24f342de93341225c
parent6c0106b57fb54f9f47109508413859297378ab7d
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am: 6c0106b57f

Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
core/java/android/net/Network.java
services/core/java/com/android/server/ConnectivityService.java