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

* commit '1d053b868f9ab3d934956c59c33c7b4bb82ba589':
This commit is contained in:
Jeff Davidson
2015-02-11 08:50:05 +00:00
committed by Android Git Automerger

Diff Content Not Available