summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2011-04-28 11:48:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-28 11:48:18 -0700
commitb9ecef242013e89e4aec21c42896f6850ea51d95 (patch)
tree7b3d3f5b7643025d79244881baee98c1ee8af248 /opengl/tests/gl_basic/gl_basic.cpp
parent50bcaa2676a0a990d92e0477bdb3541870b7dec1 (diff)
parentadb031659d7db9bbf61c78350c39b78b1a83114a (diff)
am 5ac02e73: (-s ours) am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
* commit '5ac02e73c313935b1af8a536e47f74b616986dfe': Check setName() for null string + fix rsRand().
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions