Skip to content
Commit a1622655 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-mr1-dev am: 1e5152b5  -s ours
am: b32be39c  -s ours

Change-Id: Ia1dfd55946842083d4e3256a51607cecf59a67b8
parents cf164db3 b32be39c
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