summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2010-04-05 15:42:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-05 15:42:30 -0700
commit9d2687587d2a57412004a3d7754e6c8ea3e15d7d (patch)
treecdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp
parent1044401a774c56bc0f703dfd33435df7c3de8988 (diff)
parent86698b3ed3e8b0ade488b3fa1d73c15feedfcba7 (diff)
am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp * commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f': bug 2542580: fix bad icon.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions