OSDN Git Service

Merge "vpn: allow IPSec traffic through Always-on VPN"
authorBernie Innocenti <codewiz@google.com>
Tue, 5 Jun 2018 05:53:58 +0000 (22:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 05:53:58 +0000 (22:53 -0700)
commit254f08bc70499a5212c14375bef0c8e6ffdbc21f
tree9568cfdb2f455e453d241ec2edbf1e099b47667e
parentd490e788f170aefed957753dd1f5f9e05500970e
parent4d3b5c1d3beb7849548ba3d1aba162e6789958ce
Merge "vpn: allow IPSec traffic through Always-on VPN"
am: 4d3b5c1d3b

Change-Id: I90fbe3ad3ec8b9d3b52e6036ae07dd8db814cb22