diff options
| author | Marco Nelissen <marcone@google.com> | 2010-05-12 07:56:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:56:24 -0700 |
| commit | 9cafcad31df9e5ed8aee8360348546988f52a675 (patch) | |
| tree | 19ab3fba69bd9bfeb70b2823e48cbd9e2a132068 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d643705c0648d7ecc33df8bc38b3638d0b43ab54 (diff) | |
| parent | 21fdf08187cb23f879ca0037efa9ea861542041f (diff) | |
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
Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken
* commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b':
Don't clear the _data column in the audio_meta table, since it isn't
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions