summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-13 18:58:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-13 18:58:20 -0700
commit21ccd0138f2e339137d4524893e85e9856c1e367 (patch)
tree1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp
parent9af992912514bd972b5c8d6436fe75a67641ad00 (diff)
parent6b6818ff6280e99afbc524e60d319fde542fc5ae (diff)
am 527c0283: am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread
Merge commit '527c02838bed1188b9211752b4cf2fc0c03e8202' * commit '527c02838bed1188b9211752b4cf2fc0c03e8202': Work on issue #2991868: A toast pops up informing users...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions