OSDN Git Service

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a am...
authorRoland Levillain <rpl@google.com>
Tue, 4 Jul 2017 11:46:56 +0000 (11:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 11:46:56 +0000 (11:46 +0000)
commit6a5016df21586fe268f8370be89b8a1eb5d30b33
tree7ea37e2634f841c7ccd389dd9525dce0bfca5e82
parentb566fa91a0ad25c4db982abf4ece44d82c5bf2a3
parentbdcebe39e686dd8a8b3fba94e0c4ea33eae44714
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a am: d3f26b6731
am: bdcebe39e6

Change-Id: I428cb473221a403e3c78cbc5d1224d46747ec315
core/java/android/net/NetworkCapabilities.java