OSDN Git Service

Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 am: 0537f16516
authorHugo Benichi <hugobenichi@google.com>
Wed, 5 Jul 2017 14:47:56 +0000 (14:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 14:47:56 +0000 (14:47 +0000)
commitf060ecf1e81cb6c0fb19a01aea369a523671247d
tree0c86d3ddecf7765a21ce659dbab12996c99994b8
parent89c67d3211e6c1c50a322155403197cd46a33558
parent0278aa4b7011e33ea0b27a0bc5f69484bbea2bca
Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 am: 0537f16516
am: 0278aa4b70

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