| commit | 2d6063b63c786a87179b7822cc17c56581fa79b1 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Feb 11 08:44:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 08:44:34 2015 +0000 |
| tree | c2e11e28f925cd4c8ee545635f61537995905528 | |
| parent | b1d3df3269eae9c1397d5f94d60f621d75c3cb8b [diff] | |
| parent | e4be48e0853bcde90d738031433271c5e41bd5e2 [diff] |
am e4be48e0: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev automerge: 46dbb5b * commit 'e4be48e0853bcde90d738031433271c5e41bd5e2': Do not enforce CONTROL_VPN for calls from lockdown VPN.