Skip to content
Commit 213af1a7 authored by Bernie Innocenti's avatar Bernie Innocenti Committed by android-build-merger
Browse files

[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN"... 

[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am: 8f1c70e4
am: d1f53d13  -s ours

Change-Id: I293fc38d50e75b0b021dff6af045ac8a2aa6927f
parents 1e5152b5 d1f53d13
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment