commit 7fe6c1295126f581992144445e6522ee4d8c66dc
author Todd Kjos <tkjos@google.com> Tue Sep 13 12:40:32 2016 -0700
committer Todd Kjos <tkjos@google.com> Tue Sep 13 12:40:32 2016 -0700
tree 6745841d523095548595ab767ec6893814040914
parent e2c7221fdc42f96a58106fb7a8dec2449d686992
parent f2a1eadbc0d6f10d57b1d0b2959891cccade69ac

resolve merge conflicts of c6937f2 to nyc-mr1-dev-plus-aosp

Change-Id: I82638b0dab5e1b5117f4ed4752fd2cbdaf8c47b1

rootdir/init.zygote32_64.rc

diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc
index a5e32c2..4156847 100644
--- a/rootdir/init.zygote32_64.rc
+++ b/rootdir/init.zygote32_64.rc
@@ -8,7 +8,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main

rootdir/init.zygote64_32.rc

diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc
index 4a32097..27eaa66 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -8,7 +8,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main