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

am: 516274249f Change-Id: Ifd131fb69d3fb2fe31bd0f06c074fdf15408dece
2017-02-11 01:24:32 +00:00
parent ee4b962c96 516274249f
commit 01f47c116c
1 changed files with 3 additions and 0 deletions
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -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,