summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-21 20:17:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 20:17:50 -0700
commitd07349ee7f383288f6a8bed987a92deff789b631 (patch)
tree16d550976076f0294750952e0cc42d55b9a64ea4 /opengl/tests/gl_basic/gl_basic.cpp
parent37e376f2ede230e15e07f5f3a1e1096372bfc38c (diff)
parenteab490ad03fc1418650d4f155587f11bd3d94dc7 (diff)
am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp * commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc': Fix issue #3117918: No way to finish a native activity
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions