OSDN Git Service

Merge changes I59b6e04f,I55694d89 am: 9009eabbfe
authorHugo Benichi <hugobenichi@google.com>
Thu, 26 Oct 2017 06:23:31 +0000 (06:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Oct 2017 06:23:31 +0000 (06:23 +0000)
commit597757b8ab01c3d19879c4c43b5d3709d35bff33
treebaa497c502299ba828e2b860cdce506682186746
parent7990e6b0eb1b21a4e472fe2cbd7949bacce8e321
parent93134fea64436150aa5e4660d7632dd2097eede9
Merge changes I59b6e04f,I55694d89 am: 9009eabbfe
am: 93134fea64

Change-Id: I923fe9cc37463e695182c7a279d201ba7e9d6518
services/core/java/com/android/server/ConnectivityService.java