summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-06-03 14:43:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-03 14:43:31 -0700
commit9a73483248d90d03ec0e44d18e86a7d674e08d11 (patch)
treef131f449d1316816f9fb2411882e310e1c6f955d /opengl/tests/gl_basic/gl_basic.cpp
parent60bb5dea2b742b1e85edc4fb93e4eefe4135599a (diff)
parent57416d878e20d58395828085224fef5eb6682382 (diff)
am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit '5c6e95a77359bd6f758164b7f5a5a92093c2498f': doc typo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions