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

* commit '5d8a31c46c947c2c5f56669c00e6c8aea31c47f7':
This commit is contained in:
Jeff Davidson
2015-02-11 08:44:38 +00:00
committed by Android Git Automerger

Diff Content Not Available