diff options
| author | Jesse Hall <jessehall@google.com> | 2013-05-13 13:08:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-13 13:08:54 -0700 |
| commit | f9872c8124d896349d1dd0284def8bc9add8e0ac (patch) | |
| tree | 65147b0f41b2c92cdd4849b7052509f3a7a3fa74 /opengl | |
| parent | f3e85d432749ca77ad707bec523b67d741d43e6e (diff) | |
| parent | 7a4865287460a5f0ff26e22be5f0271735d32ac7 (diff) | |
| download | frameworks_native-f9872c8124d896349d1dd0284def8bc9add8e0ac.zip frameworks_native-f9872c8124d896349d1dd0284def8bc9add8e0ac.tar.gz frameworks_native-f9872c8124d896349d1dd0284def8bc9add8e0ac.tar.bz2 | |
am 7a486528: am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
* commit '7a4865287460a5f0ff26e22be5f0271735d32ac7':
gl_code.cpp: Remove a DOS style newline
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/gl2_jni/jni/gl_code.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/tests/gl2_jni/jni/gl_code.cpp b/opengl/tests/gl2_jni/jni/gl_code.cpp index fa6bd93..ed896a4 100644 --- a/opengl/tests/gl2_jni/jni/gl_code.cpp +++ b/opengl/tests/gl2_jni/jni/gl_code.cpp @@ -153,7 +153,7 @@ extern "C" { JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_step(JNIEnv * env, jobject obj); }; -JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * env, jobject obj, jint width, jint height)
+JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * env, jobject obj, jint width, jint height) { setupGraphics(width, height); } |