summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-01-13 13:12:34 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-13 13:12:34 -0800
commit575f408150678f6c59c9387b771a1bdee195b3d4 (patch)
tree485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp
parent3d9e6137a8abbfaa5b2041d07c124b82d35c7352 (diff)
parentf39fc5a881d3e8290b065cf5d96d46cca9366bd5 (diff)
am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30': Fix issue with selecting proper JNI libraries
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions