diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-23 15:04:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-23 15:04:28 -0700 |
| commit | 5ac6e1e0228ff79cd8ce766dc40bce59c411d6f8 (patch) | |
| tree | 7845c43fd30484b450d101f924bc70d1b7f6c8f8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2f31238dfe12c0b5f954dadb4770b619fd5d98e4 (diff) | |
| parent | 66282a6a092f8466bc3dddf24663c58b112455d3 (diff) | |
am 5b0f030d: resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp
Merge commit '5b0f030d0bfdf7003e74b24da8c4379c74447380'
* commit '5b0f030d0bfdf7003e74b24da8c4379c74447380':
Remove compilation warnings by removing illegal characters
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions