OSDN Git Service

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a am...
authorRoland Levillain <rpl@google.com>
Tue, 4 Jul 2017 11:53:16 +0000 (11:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 11:53:16 +0000 (11:53 +0000)
commit1a9fa0e1be010e437d315a9682d28d5d25a5c5d9
tree4040c0174c2107af770ad96bc0159e07ac455bf5
parent85d3a826c388236610e18c62957c65556b0af733
parent6a5016df21586fe268f8370be89b8a1eb5d30b33
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a am: d3f26b6731 am: bdcebe39e6
am: 6a5016df21

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