| commit | e4be48e0853bcde90d738031433271c5e41bd5e2 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Feb 11 08:38:35 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 11 08:38:35 2015 +0000 |
| tree | 05aa618453ea914fe28a8616491ff040c1b07cdf | |
| parent | 0f0e93dc702e97644bacceb7ac08552672a8151d [diff] | |
| parent | 46dbb5be4c56e8af603514a3cf2bd7daf0191724 [diff] |
am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev automerge: 46dbb5b * commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724': Do not enforce CONTROL_VPN for calls from lockdown VPN.