commit dec13fb8070323385d5f5a026058fc2e26a5f62d
author Elliott Hughes <enh@google.com> Tue May 03 22:59:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 22:59:27 2016 +0000
tree ad8ed98949a542fda0791dba7d0a8ef740506573
parent 6ff8bfb1c44d2089f40c94933f193c242895e167
parent ac17802ec248c7ffaf0681b41eb3b9bc7712c27b

DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot. am: a463d24633  -s ours am: 1baf911bd5  -s ours
am: c04a11c9e3  -s ours

* commit 'c04a11c9e3bc1a314f05561648a0db6da767d03d':
  DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot.

Change-Id: Id39182b1ebd96cf51d987e47c1fedfd3f0fa45c3

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