| commit | 535809ab83f0f57ddf3dba7429f2513d8d943ce3 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Feb 11 08:50:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 08:50:05 2015 +0000 |
| tree | c2e11e28f925cd4c8ee545635f61537995905528 | |
| parent | 2d6063b63c786a87179b7822cc17c56581fa79b1 [diff] | |
| parent | 1d053b868f9ab3d934956c59c33c7b4bb82ba589 [diff] |
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':