Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a875ab2 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:... 

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

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



Change-Id: I0cf101be730320480f0324bcdc996cd32b915e58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents afbc209d a2041360
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment