commit bba4549d62ba9975375ba5174e3c333a6f64356a
author Colin Cross <ccross@android.com> Fri Apr 29 00:15:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 29 00:15:22 2016 +0000
tree 69c144e640f1b58befec2bb035b0f8d3711fa38c
parent 4d30ca7c00e409583c2369c6ab2e1ff8bfa27a1d
parent b60d34d4690dddc6fb7be7471a448696dbb3dddb

Silently ignore duplicate heap entries
am: cecd64012d

* commit 'cecd64012db013331ff1071254ab543dcdf327bd':
  Silently ignore duplicate heap entries

Change-Id: I67edc2bdedbd28bf4b11a071e132ae213d143bc1

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