summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-08-20 15:45:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-20 15:45:09 -0700
commitd86edf589d0d27c2ad62f031dfec20d104968903 (patch)
tree85f48fd8e5576feecb15939f81e6af4bbe1942fc /opengl/tests/gl_basic/gl_basic.cpp
parent0b8ebfc1584d5580ae4ad1bc085219fd9c63c78b (diff)
parentfa141f3ac5369a517381e940f958f357141d4a2d (diff)
am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
Merge commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d' into gingerbread-plus-aosp * commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d': Load bitmaps in the correct format.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions