summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2013-12-15 00:25:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-15 00:25:52 +0000
commitd44e20c11e668fdb915573de8519a1531be3e93f (patch)
tree5d9c60544cbaf65ebdb05333004c272855394d15
parent6a0db5990187a71427029fb0fd64394e849aa057 (diff)
parent1add78943fa4ce3e74103ce9ef60a18f86483fc2 (diff)
downloadframeworks_base-d44e20c11e668fdb915573de8519a1531be3e93f.zip
frameworks_base-d44e20c11e668fdb915573de8519a1531be3e93f.tar.gz
frameworks_base-d44e20c11e668fdb915573de8519a1531be3e93f.tar.bz2
am 1add7894: am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '1add78943fa4ce3e74103ce9ef60a18f86483fc2': Fix incorrect name in eglSwapBuffers log wrapper
-rw-r--r--opengl/java/android/opengl/EGLLogWrapper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/EGLLogWrapper.java b/opengl/java/android/opengl/EGLLogWrapper.java
index 36e88a2..c677957 100644
--- a/opengl/java/android/opengl/EGLLogWrapper.java
+++ b/opengl/java/android/opengl/EGLLogWrapper.java
@@ -326,7 +326,7 @@ class EGLLogWrapper implements EGL11 {
}
public boolean eglSwapBuffers(EGLDisplay display, EGLSurface surface) {
- begin("eglInitialize");
+ begin("eglSwapBuffers");
arg("display", display);
arg("surface", surface);
end();