| commit | 04c2e47b0d67c0bf6a9009ae438256770537a92e | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Oct 16 09:22:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 09:22:52 2014 +0000 |
| tree | f6b355f3cf80d2298b05d3b7dccacfcda306bf41 | |
| parent | 717bcc2723094097e737d9715d8fa091704c6aa6 [diff] | |
| parent | b7d8514822aefbf8274f5464dc12cee151e2b78b [diff] |
am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev * commit 'b7d8514822aefbf8274f5464dc12cee151e2b78b': Allow root and system to bypass the always-on VPN firewall rules