OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d25b9a
8e338f7
)
Merge "Mark networks with OEM_PAID always restricted"
author
Lorenzo Colitti
<lorenzo@google.com>
Fri, 30 Mar 2018 08:47:25 +0000
(08:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 30 Mar 2018 08:47:25 +0000
(08:47 +0000)
am:
8e338f7dae
Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
1
2
core/java/android/net/NetworkCapabilities.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/NetworkCapabilities.java
Simple merge