commit ad81a1d94a18097d32a80040ebac5940f073c8b6
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 13 23:09:36 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 13 23:09:37 2016 +0000
tree 16d55dbdf59645162f6d36f30a4a4b1c8d30330b
parent de029a894ae781858b0484840d5c7ba9b3cf3200
parent d8f26e2ac94fe30def727b37e55547c3aa77bbe3

Merge "Base: Fix dangling-else in CHECK_STROP"

rootdir/init.zygote32_64.rc

diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc
index 10fa915..3bfa0af 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 /sys/fs/cgroup/stune/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 1164ac5..5640490 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 /sys/fs/cgroup/stune/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