Merge change I66a4a6e4
* changes:
Fix merge conflict markers that accidentally got checked in.
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 @@
}
/*
-<<<<<<< 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) {