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

Commit 2d3cc51c authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add VpnManager.TYPE_VPN_OEM_* constants for OEM use." into main am:... 

Merge "Add VpnManager.TYPE_VPN_OEM_* constants for OEM use." into main am: f5b136e0 am: 7c4d9a64

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



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