commit 066c9b5a005fdb84ea72a6d27a40ab5bf5e6f0e2
author Sreeram Ramachandran <sreeram@google.com> Wed May 14 19:51:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 14 19:51:37 2014 +0000
tree 606a823de348879157c57c3ea5c5174d2d49a0e9
parent 12d9b8272df84a270a64269888378865e3d5148e
parent 9743f09724162186fb280627c3c125a55534a219

am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."

* commit '9743f09724162186fb280627c3c125a55534a219':
  Introduce fwmarkd: a service to set the fwmark of sockets.

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index bdb68a9..f9d28bb 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -514,6 +514,7 @@
     socket netd stream 0660 root system
     socket dnsproxyd stream 0660 root inet
     socket mdns stream 0660 root system
+    socket fwmarkd stream 0660 root inet
 
 service debuggerd /system/bin/debuggerd
     class main