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

Commit 42ce6494 authored by Jean Chalard's avatar Jean Chalard Committed by Automerger Merge Worker
Browse files

Merge "Document limitations of the VpnService setHttpProxy API" into main am:... 

Merge "Document limitations of the VpnService setHttpProxy API" into main am: 93c7b643 am: f2daccaa am: a911e286 am: 24adac99 am: 411b0497

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



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