summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2012-02-23 18:45:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-23 18:45:51 -0800
commit4a425fb9e85c4dafcad7dad5e435675f56a51705 (patch)
tree0ecbd0769f339854cca023a8cf56e75f0ba5aa63 /opengl/tests/gl_basic/gl_basic.cpp
parent85492ed98ea89eafb77e5fc5576b052fa2e9c024 (diff)
parent892dd2e7a95a327413cc0fda2d2cf462da3000bf (diff)
am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit 'c6e3f6f1a758a91d486cbcebb8241f8413c6e770':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions