OSDN Git Service

Merge "Mark networks with OEM_PAID always restricted" am: 8e338f7dae
authorLorenzo Colitti <lorenzo@google.com>
Fri, 30 Mar 2018 09:05:09 +0000 (09:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 09:05:09 +0000 (09:05 +0000)
commitf04afa25379e242f1646699667428dab013c8b58
treec188274478d2148dad0ef56a796648db5d558d9b
parent269a7b9efd38a20737eb6454f3d6b9f1968bd02d
parentb9cce46ba877beb3348a9c4291de6582086d0532
Merge "Mark networks with OEM_PAID always restricted" am: 8e338f7dae
am: b9cce46ba8

Change-Id: I88500f6add4f1a6c8a77eb976a489c11c7dc5b6d
core/java/android/net/NetworkCapabilities.java
tests/net/java/android/net/NetworkCapabilitiesTest.java