commit 9739fb62716f7a62493ae4bf934b0423016e3986
author Josh Gao <jmgao@google.com> Fri May 06 21:42:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 06 21:42:30 2016 +0000
tree b04d648805279dfde9e0a71dab074b6eb0aceca3
parent d7576c558cd7d4033676236518e75044a453768f
parent 27fdafcfd65d5541a843a63b1e423dc49ea919e1

Merge "adb: search for a maximum of 16 emulators." into nyc-dev am: 72e47300fb
am: 2928f7df70

* commit '2928f7df70e4b0768dd7f2bd0b2b1077d1b3d25f':
  adb: search for a maximum of 16 emulators.

Change-Id: Iff940c44a7a5ed3edf0668ecb68aa961fe1e0283

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