Skip to content
Commit 4ed21630 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Have VPN use ESP_IP_VERSION and ESP_ENCAP_TYPE" am: 8c05531a am: e254b772 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2440293



Change-Id: Ia9d8c4da0a5071d59dd92d49b563896eaa653bac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05f5ef74 e254b772
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