| commit | e526668eae7ba79e9558cb2b34486bbae2403fd5 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Oct 16 18:35:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 18:35:21 2014 +0000 |
| tree | 87b80930db6ea7f5e0d29f96d9c26b2862558b5c | |
| parent | 94dbc64c9871d394fc7038c95cc140c52ad35255 [diff] | |
| parent | d04d6c91a311af7a52f05fac5935c9327a990046 [diff] |
am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev * commit 'd04d6c91a311af7a52f05fac5935c9327a990046': Allow root and system to bypass the always-on VPN firewall rules