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:
18e5182
6001f72
)
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
author
Chalard Jean
<jchalard@google.com>
Fri, 2 Mar 2018 13:10:45 +0000
(13:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 2 Mar 2018 13:10:45 +0000
(13:10 +0000)
am:
6001f72478
Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
1
2
core/java/android/net/NetworkCapabilities.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/NetworkCapabilities.java
Simple merge
OSDN Git Service
