| commit | 54b0c7b4313a747e86262e3f60b0d59ce0b83959 | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed May 14 19:54:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 19:54:26 2014 +0000 |
| tree | 2886f2ce26a493d1f7f2890baa5cc75d20cc02f1 | |
| parent | e9272c70636999fdbe2f1b3d277101e8a59225ba [diff] | |
| parent | 066c9b5a005fdb84ea72a6d27a40ab5bf5e6f0e2 [diff] |
am 066c9b5a: am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets." * commit '066c9b5a005fdb84ea72a6d27a40ab5bf5e6f0e2': Introduce fwmarkd: a service to set the fwmark of sockets.