summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-05-12 08:49:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 08:49:29 -0700
commit2d0b5494e0cad10e081277334355b1bb8e178c11 (patch)
tree19ab3fba69bd9bfeb70b2823e48cbd9e2a132068 /opengl/tests/gl_basic/gl_basic.cpp
parent870e7fb321bf6ccc5fce2d92c31f6db7189da3af (diff)
parent9cafcad31df9e5ed8aee8360348546988f52a675 (diff)
am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions