summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-08-25 10:39:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 10:39:21 -0700
commit3734308dd59c48ac533713bd0ef3a9699c008825 (patch)
tree0314b93c0f69ae613944b5e5ca4df9908f1217ad /opengl/tests/gl_basic/gl_basic.cpp
parent19e9ecc8a292d4c2f7b4ba03a685452500e392e3 (diff)
parent944d8e92c4c3675dfc7c10d6b91219d3c0de35aa (diff)
am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp * commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9': Fix the simulator build.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions