diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-31 14:01:45 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-31 14:01:45 -0700 |
| commit | 45ef27a260c9a2d7619bd26e879313fe6733fd41 (patch) | |
| tree | c618308f3d2ab6e6abd0e25c71cec46daede8532 /opengl | |
| parent | ff46e2eed3c14eb68580e3bce2ddc206b87eb835 (diff) | |
| parent | ecf9b681121d15758b84113c90f3b17697b44a47 (diff) | |
| download | frameworks_native-45ef27a260c9a2d7619bd26e879313fe6733fd41.zip frameworks_native-45ef27a260c9a2d7619bd26e879313fe6733fd41.tar.gz frameworks_native-45ef27a260c9a2d7619bd26e879313fe6733fd41.tar.bz2 | |
merge from open-source master
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
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 +} + |