summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-30 19:12:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 19:12:11 -0700
commit2115827c8a510e1e14e3287b807e06fac7eefa87 (patch)
tree75d47cdcbb7eadf0f96aa8203158ca157cc4a260 /opengl/tests/gl_basic/gl_basic.cpp
parent9b4301378bb43f6dcab8e28d7a2965e76724eae3 (diff)
parent6381cf3b9da0927d11529a18d2f95a770268c3d0 (diff)
am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp * commit '0a69f597604254bc37721b135ab612eaacdd0cbd': Rub in a little 'ol log-b-gone.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions