diff options
author | Xia Wang <xiaw@google.com> | 2012-02-01 13:56:49 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-01 13:56:49 -0800 |
commit | 73cd05de3827a1b79a5cc64971092ff4f1a59f45 (patch) | |
tree | 8d68e2b5fc5bce3f42b3ad9695f3e51e0b3c987d /opengl/tests/gl_basic/gl_basic.cpp | |
parent | adef783a805619e32e0be781a89f6f97a29942b3 (diff) | |
parent | 3b1b659c99aedf5ff5895462e8c0af6af2639d02 (diff) |
am c8c9ebe8: am 581a3334: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit 'c8c9ebe868bb16f1b564b95243c0d5fd1d09ad6f':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions