| commit | d04d6c91a311af7a52f05fac5935c9327a990046 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Oct 16 09:23:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 09:23:24 2014 +0000 |
| tree | 0855786b837104bba8fa327dc92d915e1423de2a | |
| parent | ffd7335088d228ac0c56fdc7e2faba79c78572bf [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