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

Commit 6a16616d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Add public alternative for protectFromVpn" am: 2c49d21c am:... 

Merge "Add public alternative for protectFromVpn" am: 2c49d21c am: 25a7767c am: e456ac20 am: 7cf72665

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e6d2cd858dcc494bc43b49f90e9ce9f138d2b9c
parents 98c5c539 7cf72665
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