diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-02-02 09:56:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 09:56:30 -0800 |
| commit | 09a107d3d09d1e3d4b31a38fb44d783f163b6e76 (patch) | |
| tree | 12a552a7b5527f5337adab29948ca5123dfbece3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9aace938ce7d59c7473d4091456cf82f5b01ba48 (diff) | |
| parent | 3c47c34deec0807c102622a8b53c21495ed21957 (diff) | |
am 05059b5b: am 8226140c: Merge from gingerbread
* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions