summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-04-13 10:08:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-13 10:08:10 -0700
commit762e0ff7ebfa478a100d7be26aefaa270b4bd7a2 (patch)
tree3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp
parent54fddcb1e6c12d46059493401a1026c908fe5261 (diff)
parentf05a8854ce2a4d2e52bc41e71f6c5e655333ce05 (diff)
am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp * commit '842d983cc3158a3de77a897d071b5b9c18dd2b55': Fix an upgrade bug in SettingsProvider.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions