commit 7a4865287460a5f0ff26e22be5f0271735d32ac7
author Jesse Hall <jessehall@google.com> Mon May 13 13:05:36 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 13 13:05:36 2013 -0700
tree 456d4c183a7eb044ccbcbf7942ee155cef806754
parent 87ab83d96b9d826e94a7169a6205bcf9c2ee633a
parent f0dcff89acb998179757ca66b5c6a2c585a980e9

am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"

* commit 'f0dcff89acb998179757ca66b5c6a2c585a980e9':
  gl_code.cpp: Remove a DOS style newline

opengl/tests/gl2_jni/jni/gl_code.cpp

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 @@
     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);
 }