OSDN Git Service

[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into...
authorBernie Innocenti <codewiz@google.com>
Fri, 13 Jul 2018 16:42:28 +0000 (09:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 16:42:28 +0000 (09:42 -0700)
commit66bbd64d7d0317b605d62b930fdfb891573cae1e
tree42252a02c00789da3dfce676f3e428ec576ce311
parentb32be39c6d0d3ed2adc81c2cda4aaffcd5266679
parent213af1a79e2514f0b7ee7814e485fb80573fd43a
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am: 8f1c70e49b am: d1f53d13a9  -s ours
am: 213af1a79e  -s ours

Change-Id: If0154030422d4ddd2b4383f9e107125d67f7b409