OSDN Git Service

Merge changes I4b1bca8b,Idb7d2f28,I4825e632
authorChalard Jean <jchalard@google.com>
Mon, 18 Jun 2018 10:06:05 +0000 (03:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jun 2018 10:06:05 +0000 (03:06 -0700)
am: 84d4e535ae

Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee

1  2 
services/core/java/com/android/server/ConnectivityService.java