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

am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for... 

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

* commit '5d8a31c4':
parents e4be48e0 5d8a31c4
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