diff options
| author | 2010-07-02 07:38:30 -0700 | |
|---|---|---|
| committer | 2010-07-02 07:38:30 -0700 | |
| commit | f601ce2c1455cbfee3289309d20e55172df71bf6 (patch) | |
| tree | 880eb6e83e11c2d0b819271ea5446253b0f603e7 | |
| parent | 1cbf9482d7d32bac60741d6e512f3ac921f3a6aa (diff) | |
| parent | 61af57bfc370ac0bbdf8a262afadf2f60a5bbded (diff) | |
merge from open-source master
Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
| -rw-r--r-- | libs/rs/rsNoise.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/gl_jni/jni/gl_code.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libs/rs/rsNoise.cpp b/libs/rs/rsNoise.cpp index 764dc1a8cdd1..4b675861e791 100644 --- 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) } } -}
\ No newline at end of file +} diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp index f031c79cd33e..ef66841f2792 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; } - |