commit 761c1e1f7dde915034af9d231894ef72d603dc38
author Yabin Cui <yabinc@google.com> Tue Apr 26 23:29:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 26 23:29:14 2016 +0000
tree 27c263dae7d261cf79eb5ae6c38cbae0f9f21cb3
parent 679728f599aebc2c8018be66590dce5bc2b4a36e
parent 62295d17228ceaf68a25888e43afe2b88f62584b

Merge "Fix kick_transport test." into nyc-dev
am: 550ad20d

* commit '550ad20d64e3a4cc508fac172c62f16b0d201acd':
  Fix kick_transport test.

Change-Id: I178d5aa37fb77906b5487df2a7aa80cb01ee9f90

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