summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-28 13:14:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-28 13:14:43 -0700
commit240d6d2042fcb6dbf04a115be6fed0a8c894a892 (patch)
tree532df9facad6571445d85a65fb59ba0580ea5050 /opengl/tests/gl_basic/gl_basic.cpp
parent8345be2b2d42adc94aa749292b44d7b9b4030344 (diff)
parent6f34aa18b73d035da38f0d5d118750faf1b5e510 (diff)
am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo
Merge commit 'bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp * commit 'bc5a03286a72dc3627cee313d473178f5a123049': Fix issue #2569139: Sapphire user cannot login to last.fm...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions