diff options
| author | Marco Nelissen <marcone@google.com> | 2010-05-12 07:50:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:50:14 -0700 |
| commit | 21fdf08187cb23f879ca0037efa9ea861542041f (patch) | |
| tree | 1da85f32dbecd5d62e79d5a68d57f0398547714b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3bf653e82a790619f80880b6276ff8761e5b964d (diff) | |
| parent | ac1feedad231cc78d634f3362bbe5dab2ede8fd3 (diff) | |
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 '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp
* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
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