Skip to content
Commit cf164db3 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" into pi-dev 

am: 903d5973  -s ours

Change-Id: I459cc0215436f5fb1266a9053404487ac1cbd1f4
parents 67a6e07e 903d5973
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