OSDN Git Service

Merge "Mark networks with OEM_PAID always restricted"
authorLorenzo Colitti <lorenzo@google.com>
Fri, 30 Mar 2018 08:47:25 +0000 (08:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 08:47:25 +0000 (08:47 +0000)
commitb9cce46ba877beb3348a9c4291de6582086d0532
tree360a79d646171a72e64f5c84d0b67b9675ef4397
parent7d25b9abf6ecbf9e3eeec33efde5384ae99b1bed
parent8e338f7dae163fbd0b2ad5a91e38cbccff659366
Merge "Mark networks with OEM_PAID always restricted"
am: 8e338f7dae

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