tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of c6937f2 to nyc-mr1-dev-plus-aosp

Browse source 
Change-Id: I82638b0dab5e1b5117f4ed4752fd2cbdaf8c47b1
This commit is contained in:
Todd Kjos 2016-09-13 12:40:32 -07:00
commit 9453ea8ba9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rootdir/init.zygote32_64.rc
View file

@ -8,7 +8,7 @@ service zygote /system/bin/app_process32 -Xzygote /system/bin --zygote --start-s
onrestart restart cameraserver
onrestart restart media
onrestart restart netd
writepid /dev/cpuset/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

2
rootdir/init.zygote64_32.rc
View file

@ -8,7 +8,7 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s
onrestart restart cameraserver
onrestart restart media
onrestart restart netd
writepid /dev/cpuset/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