Skip to content
Commit e4dc066e 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 am: 213af1a7  -s ours
am: 66bbd64d  -s ours

Change-Id: I58c75d2ec05c1470cabed265fa6d4e095ff698b8
parents a1622655 66bbd64d
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