merge from open-source master

Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
2010-07-02 07:38:30 -07:00
parent 1cbf9482d7 61af57bfc3
commit f601ce2c14
2 changed files with 1 additions and 2 deletions
--- a/libs/rs/rsNoise.cpp
+++ b/libs/rs/rsNoise.cpp
@@ -253,4 +253,4 @@ float SC_turbulencef3(float x, float y, float z, float octaves)
 }

 }
-}
+}
--- 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;
 }
-