| commit | 50996a12a8e859346d5eb3c4569c4e81c9b52a05 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Feb 11 08:25:26 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 11 08:25:27 2015 +0000 |
| tree | ee718a236ef383ecb3f68cb450b73997195d0800 | |
| parent | c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4 [diff] | |
| parent | b21298a686b04d55ff97223dd317497845713f4b [diff] |
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev