summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2013-12-14 16:16:24 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-14 16:16:24 -0800
commite2e15d6da1936890117ad21fb6b18cce321c7d2b (patch)
treec1d78c21f243528b62ec0a520f024313670fcae1
parent62d509d24f91959b75219edd0ab1a6f22b82c600 (diff)
parenta0ab49bb52f44eac97f81117d6864edd6a2e0487 (diff)
downloadframeworks_base-e2e15d6da1936890117ad21fb6b18cce321c7d2b.zip
frameworks_base-e2e15d6da1936890117ad21fb6b18cce321c7d2b.tar.gz
frameworks_base-e2e15d6da1936890117ad21fb6b18cce321c7d2b.tar.bz2
am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit 'a0ab49bb52f44eac97f81117d6864edd6a2e0487': 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();