summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-08-04 11:11:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-04 11:11:50 -0700
commit38e0c64c04ec5dadf2dd29a55b1ec5f8ee0f499f (patch)
treee729af738a12a7a30c3a2f09fa715a45c08c0243 /opengl/tests/gl_basic/gl_basic.cpp
parentb2c4974c6ba08fb02e6ae711ce34ad88e7d5cda9 (diff)
parentd5e854edcf5ff977bbf023983c8a33454bf1fa56 (diff)
am 9b84e8df: am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80' * commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80': Fixed a typo in a method name of MediaPlayerPerformance.java class
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions