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

Commit 4fee8c7d 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 am: a8ee99b4

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



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