diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-31 14:23:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 14:23:19 -0700 |
| commit | 9bab8f115b4dbb9c6d8e0e0b3040aa846ca6e5ca (patch) | |
| tree | 66740c3195779e3e5791cc70642cc1458ee6c151 /opengl | |
| parent | 27efd391709810bb78a25f5384cc755744aa32da (diff) | |
| parent | 4790259c329bc25520a0f2a6c467d317ad4c1f4d (diff) | |
| download | frameworks_base-9bab8f115b4dbb9c6d8e0e0b3040aa846ca6e5ca.zip frameworks_base-9bab8f115b4dbb9c6d8e0e0b3040aa846ca6e5ca.tar.gz frameworks_base-9bab8f115b4dbb9c6d8e0e0b3040aa846ca6e5ca.tar.bz2 | |
am 4790259c: am 8de2cf4c: merge from open-source master
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/gl_jni/jni/gl_code.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp index 33b25ab..f031c79 100644 --- a/opengl/tests/gl_jni/jni/gl_code.cpp +++ b/opengl/tests/gl_jni/jni/gl_code.cpp @@ -180,4 +180,5 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_step(JNIEnv * env, jobjec JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv * env, jobject obj) { background = 1.0f - background; -}
\ No newline at end of file +} + |