diff options
| author | Dan Egnor <egnor@google.com> | 2010-04-10 11:47:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:47:29 -0700 |
| commit | 1081f91a219b68849a65a02db59cac60225fbedb (patch) | |
| tree | 0221e52f74a0b4fb7b87fe976b11d0908fccf87a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c58af6b44c0a5c718a46e6e22d0eb947fd2dad65 (diff) | |
| parent | e9675befc93cab12582537230409be476af48fff (diff) | |
am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
Merge commit '505f22d1a4dbf1fceaf8deca443d7322386964e1' into kraken
* commit '505f22d1a4dbf1fceaf8deca443d7322386964e1':
Fix sim build (sim doesn't have strl*() reliably...)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions