summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-08-06 19:07:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-06 19:07:24 -0700
commita8c319bae6fd3b27629f6ff92c33f2923dfb34f1 (patch)
treee322e5740941cb092c1291b54ec648b4e1785eb3 /opengl/tests/gl_basic/gl_basic.cpp
parentbf08de9e543a9caabb68ba55bacd7c9c9b0138ab (diff)
parent2a6e502ea23d6691af3305c0982bd8dd2733e08d (diff)
am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52' * commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52': COMMENT ONLY change to fix some formatting glitches and
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions