commit fc957a3fd298294888d0306bb1f455a0253a3c73
author Dimitry Ivanov <dimitry@google.com> Wed May 04 22:34:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 04 22:34:13 2016 +0000
tree 3757f13b2e31bce78471b9f33db35fbd69b17c0b
parent 7beb818fdd8a250cc1876504a1f3eb7cbf857149
parent c2d14d22635d8716046131090f56e210d5c2f176

Merge "nativeloader: Add CloseNativeLibrary() method" into nyc-dev am: acd3c71784
am: 256e4b0dfc

* commit '256e4b0dfcff4750cf91ffd7338a934fb92c7645':
  nativeloader: Add CloseNativeLibrary() method

Change-Id: Ia90cb04a6ca975e945097f2105e315f3aa5d7ee2

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