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

Commit 01f47c11 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

resolve merge conflicts of b3a14176 to nyc-mr2-dev-plus-aosp 

am: 51627424

Change-Id: Ifd131fb69d3fb2fe31bd0f06c074fdf15408dece
parents ee4b962c 51627424

core/java/com/android/internal/os/ZygoteInit.java

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ public class ZygoteInit { 
        Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadOpenGL");

        preloadOpenGL();

        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

        Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadOpenGL");

        preloadOpenGL();

        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

        preloadSharedLibraries();

        preloadTextResources();

        // Ask the WebViewFactory to do any initialization that must run in the zygote process,