diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-01 13:46:03 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-07-01 13:46:03 -0700 |
| commit | 61af57bfc370ac0bbdf8a262afadf2f60a5bbded (patch) | |
| tree | 2f0a8e1d3cf9bb0d1a30c7758e4e8751aad6fe8b | |
| parent | f97683d1c119e111a3f35c674817ef3fa2540cf2 (diff) | |
| parent | fd23461c2b9e482262f5af6b96fcabf99fecca7f (diff) | |
| download | frameworks_base-61af57bfc370ac0bbdf8a262afadf2f60a5bbded.zip frameworks_base-61af57bfc370ac0bbdf8a262afadf2f60a5bbded.tar.gz frameworks_base-61af57bfc370ac0bbdf8a262afadf2f60a5bbded.tar.bz2 | |
Merge "Fix missing NL"
| -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 764dc1a..4b67586 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 f031c79..ef66841 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; } - |