commit b60b3ad7f089f9392c8f9eacee7d324d881939be
author Mark Salyzyn <salyzyn@google.com> Fri Apr 29 15:46:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 29 15:46:27 2016 +0000
tree ddbe49f9e04af38aab8571b9df8ddf2f667496c2
parent 11857530aca874aa8c3692cb96e06fb605c25e77
parent f981c3b5beaee15187a6b1e6d26980fbaff2567c

Merge "liblog: O_CLOEXEC flag on opens" am: fc80b22752 am: a0afba8a87
am: 9fd5df3816

* commit '9fd5df3816efed26b53816594e294a38f4dd8c1b':
  liblog: O_CLOEXEC flag on opens

Change-Id: I6e3fa66992dfb16fe20f26469054442f28d8f8e3

rootdir/init.zygote32_64.rc

diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc
index 555eda4..b50fe46 100644
--- a/rootdir/init.zygote32_64.rc
+++ b/rootdir/init.zygote32_64.rc
@@ -7,7 +7,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 46f9f02..615fe66 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -7,7 +7,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