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:
048c675
254f08b
)
Merge "vpn: allow IPSec traffic through Always-on VPN" am: 4d3b5c1d3b
author
Bernie Innocenti
<codewiz@google.com>
Tue, 5 Jun 2018 06:08:48 +0000
(23:08 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 5 Jun 2018 06:08:48 +0000
(23:08 -0700)
am:
254f08bc70
Change-Id: I8edeb0942e661c8385ff0cd3fdb72e6f62a8f218
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
OSDN Git Service
