summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2009-12-21 17:39:58 +0800
committerJack Palevich <jackpal@google.com>2009-12-21 17:39:58 +0800
commit66a4a6e45f59f72f24d710221c27db1bd233e154 (patch)
tree21a1f118bd5b11596df872825390acde373c7e8b
parent21799450ec751fd3c41c7e66e69fefb094b3050b (diff)
downloadframeworks_base-66a4a6e45f59f72f24d710221c27db1bd233e154.zip
frameworks_base-66a4a6e45f59f72f24d710221c27db1bd233e154.tar.gz
frameworks_base-66a4a6e45f59f72f24d710221c27db1bd233e154.tar.bz2
Fix merge conflict markers that accidentally got checked in.
(They were in a comment, so it wasn't detected by the compiler.)
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java6
1 files changed, 1 insertions, 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) {