| commit | 1d053b868f9ab3d934956c59c33c7b4bb82ba589 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Feb 11 08:44:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 08:44:38 2015 +0000 |
| tree | 05aa618453ea914fe28a8616491ff040c1b07cdf | |
| parent | e4be48e0853bcde90d738031433271c5e41bd5e2 [diff] | |
| parent | 5d8a31c46c947c2c5f56669c00e6c8aea31c47f7 [diff] |
am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev * commit '5d8a31c46c947c2c5f56669c00e6c8aea31c47f7':