resolved conflicts for merge of f601ce2c to master
Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
This commit is contained in:
commit
d26e345f29
@ -181,4 +181,3 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv *
|
||||
{
|
||||
background = 1.0f - background;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user