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 | 8de2cf4cce9ae2e121fccb4732fd23c64aace102 (patch) | |
| tree | 18e1194624515277a01892e65ae79f1389c65fda /opengl | |
| parent | 93511f384b1180bf5277a26ceeff568fa6aa858d (diff) | |
| parent | ef9d148ad63e79b7ea1ecad49163f33a7d37aea1 (diff) | |
| download | frameworks_base-8de2cf4cce9ae2e121fccb4732fd23c64aace102.zip frameworks_base-8de2cf4cce9ae2e121fccb4732fd23c64aace102.tar.gz frameworks_base-8de2cf4cce9ae2e121fccb4732fd23c64aace102.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 +} + |