summaryrefslogtreecommitdiffstats
path: root/opengl/tests
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-02 07:38:30 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-07-02 07:38:30 -0700
commitf601ce2c1455cbfee3289309d20e55172df71bf6 (patch)
tree880eb6e83e11c2d0b819271ea5446253b0f603e7 /opengl/tests
parent1cbf9482d7d32bac60741d6e512f3ac921f3a6aa (diff)
parent61af57bfc370ac0bbdf8a262afadf2f60a5bbded (diff)
downloadframeworks_base-f601ce2c1455cbfee3289309d20e55172df71bf6.zip
frameworks_base-f601ce2c1455cbfee3289309d20e55172df71bf6.tar.gz
frameworks_base-f601ce2c1455cbfee3289309d20e55172df71bf6.tar.bz2
merge from open-source master
Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
Diffstat (limited to 'opengl/tests')
-rw-r--r--opengl/tests/gl_jni/jni/gl_code.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp
index f031c79..ef66841 100644
--- a/opengl/tests/gl_jni/jni/gl_code.cpp
+++ b/opengl/tests/gl_jni/jni/gl_code.cpp
@@ -181,4 +181,3 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv *
{
background = 1.0f - background;
}
-