Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9453ea8b authored by Todd Kjos's avatar Todd Kjos
Browse files

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

Change-Id: I82638b0dab5e1b5117f4ed4752fd2cbdaf8c47b1
parents afd59e2f c6937f26

rootdir/init.zygote32_64.rc

+1 −1
Original line number Diff line number Diff line
@@ -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

rootdir/init.zygote64_32.rc

+1 −1
Original line number Diff line number Diff line
@@ -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