Skip to content
Commit 46dbb5be authored by Jeff Davidson's avatar Jeff Davidson Committed by Android Git Automerger
Browse files

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

* commit '50996a12':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
parents 00c8450d 50996a12
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