diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-02 07:46:21 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-07-02 07:46:21 -0700 |
| commit | 3d7ab176d606918c4db0fd07aeda46769b6eb8f1 (patch) | |
| tree | c71966e3d057814e7adba972d5303467e10011dd /opengl | |
| parent | 39cae6e02b0267b6a578b0ba346b96af482a1434 (diff) | |
| parent | f601ce2c1455cbfee3289309d20e55172df71bf6 (diff) | |
| download | frameworks_base-3d7ab176d606918c4db0fd07aeda46769b6eb8f1.zip frameworks_base-3d7ab176d606918c4db0fd07aeda46769b6eb8f1.tar.gz frameworks_base-3d7ab176d606918c4db0fd07aeda46769b6eb8f1.tar.bz2 | |
resolved conflicts for merge of f601ce2c to master
Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/gl_jni/jni/gl_code.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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; } - |