From 66a4a6e45f59f72f24d710221c27db1bd233e154 Mon Sep 17 00:00:00 2001 From: Jack Palevich Date: Mon, 21 Dec 2009 17:39:58 +0800 Subject: Fix merge conflict markers that accidentally got checked in. (They were in a comment, so it wasn't detected by the compiler.) --- opengl/java/android/opengl/GLSurfaceView.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 28b10ec..471625e 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -1405,14 +1405,10 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /* -<<<<<<< HEAD - * Tries to acquire the right to use an EGL - * surface. Does not block. -======= * Tries once to acquire the right to use an EGL * surface. Does not block. Requires that we are already * in the sGLThreadManager monitor when this is called. ->>>>>>> dc49acb0 + * * @return true if the right to use an EGL surface was acquired. */ public boolean tryAcquireEglSurfaceLocked(GLThread thread) { -- cgit v1.1