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

Commit 699a4fec authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN" am:... 

Merge "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN" am: 41142d72 am: 58c07921 am: 260fe481 am: b1f445dd am: acddc0c4

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



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