resolved conflicts for merge of f601ce2c to master

Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7

opengl/tests/gl_jni/jni/gl_code.cpp

+0 −1

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