OSDN Git Service

Merge "vpn: allow IPSec traffic through Always-on VPN" am: 4d3b5c1d3b
authorBernie Innocenti <codewiz@google.com>
Tue, 5 Jun 2018 06:08:48 +0000 (23:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 06:08:48 +0000 (23:08 -0700)
commitb1c9efc6fa1f5fb660ccf22b0fb097481016de32
treee75af138d052a856c33e65e7116fd7d2550334e9
parent048c6751d77ea038b17b8cef4fbfb324f4b6b0f4
parent254f08bc70499a5212c14375bef0c8e6ffdbc21f
Merge "vpn: allow IPSec traffic through Always-on VPN" am: 4d3b5c1d3b
am: 254f08bc70

Change-Id: I8edeb0942e661c8385ff0cd3fdb72e6f62a8f218
services/core/java/com/android/server/connectivity/Vpn.java