summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRay Chen <raychen@google.com>2010-04-05 13:19:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-05 13:19:39 -0700
commit6f88aab01b3a060175bbfa25004bcf8ada0d7aa1 (patch)
treeba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp
parent4f1f69f5f6de9370f539f031d90dc85236c5527d (diff)
parent24b5b5d7b4e0b8881342d39a7500a80bf90bed23 (diff)
am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken * commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3': Make createVideoThumbnail and createImageThumbnail look consistent.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions