Skip to content
Commit bd941835 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 pi-dev am: 903d5973  -s ours
am: cf164db3  -s ours

Change-Id: I6b12b39093e3777994c3f074ec1de5294f967487
parents ca8a8a99 cf164db3
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