Skip to content
Commit 6de50c80 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add a VpnManager.TYPE_VPN_OEM." am: 9794a944 am: 630a5222 

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

Change-Id: Ic6865adf525d216d38c999a74bb4ffa35641e8a3
parents 6b91687a 630a5222
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment