summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-24 18:38:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-24 18:38:11 -0700
commita207bdf4bcbfd6b833d7dac54e514bcd8cd0fe53 (patch)
tree9b206f1df497facef94e01a850cc3c1ac8f12f8b /opengl/tests/gl_basic/gl_basic.cpp
parentb7efb89ee2a64832fcab4c4e4f12c5b6806b9658 (diff)
parent7dd80694dd85564608d6e1e94c924ee1c2c9ab36 (diff)
am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp * commit '236568999411214ef440cabc6d12e3bf5f19d8f4': Fix issue #3126018: No way to specify NativeActivity's native method
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions