OSDN Git Service

[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into...
authorBernie Innocenti <codewiz@google.com>
Fri, 13 Jul 2018 13:30:01 +0000 (06:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 13:30:01 +0000 (06:30 -0700)
commitcf164db36fe350f02d7df3158666569d97662780
tree39dac666f99e20f5973cc99d998e666466e71083
parent67a6e07ed377ef9567a5db154e9849c89da91f06
parent903d59735ec238c2630dd5707b06f9bac1b23572
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into pi-dev
am: 903d59735e  -s ours

Change-Id: I459cc0215436f5fb1266a9053404487ac1cbd1f4