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:
4add708
5ad260d
)
Merge "Support VPN Proxy(1/2)"
author
Chalard Jean
<jchalard@google.com>
Fri, 8 Mar 2019 00:34:25 +0000
(
00:34
+0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Fri, 8 Mar 2019 00:34:25 +0000
(
00:34
+0000)
1
2
services/core/java/com/android/server/connectivity/Vpn.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/connectivity/Vpn.java
Simple merge