summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-04-13 16:05:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-13 16:05:27 -0700
commitf018568bff74a3c0e13ab9acb775feec9b450dac (patch)
tree744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp
parent9bf31a9e9876bb91b14fee2c0a03abdaea575a5c (diff)
parentef18fda57189a2e0fdbfde8e7548a6a5120bb841 (diff)
am 61f280d5: am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions