resolved conflicts for merge of f601ce2c to master

Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
This commit is contained in:
Jean-Baptiste Queru 2010-07-02 07:46:21 -07:00
commit d26e345f29

View File

@ -181,4 +181,3 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv *
{
background = 1.0f - background;
}