Skip to content
Commit e4be48e0 authored by Jeff Davidson's avatar Jeff Davidson Committed by android-build-merger
Browse files

am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 

automerge: 46dbb5be

* commit '46dbb5be':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
parents 0f0e93dc 46dbb5be
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