diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-22 11:27:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-22 11:27:18 -0700 |
| commit | 6d5d69263725ea719e0947b751712e90f11c8954 (patch) | |
| tree | b594e7e306e0808afbeecf2ca73b7e943a6a5176 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 122beef52f274f2c2a4903141f892726344d3061 (diff) | |
| parent | 8db10c87818096fd3fed54154e89441fc6ea9a72 (diff) | |
am aa0e47cb: Merge change 8179 into donut
Merge commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38'
* commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38':
Fix SQL generated by updateWithOnConflict()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions