Skip to content
Commit b32be39c 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 oc-mr1-dev 

am: 1e5152b5  -s ours

Change-Id: I2ada9a973b1728122a2beb5f47d105af4507c742
parents 903d5973 1e5152b5
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