diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:16:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:16:10 -0800 |
| commit | 0e1febb6b9760f2f39c2f6c912fff42c1813032e (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6d80c67f9971aa2a8de193ee281d7459579aa5bc (diff) | |
| parent | 214ecffb0e2c4746f7befc6c875287048af8e360 (diff) | |
am c5908853: am 1fb2a6cd: reconcile main tree with open-source eclair
Merge commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373'
* commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373':
android-2.1_r1 snapshot
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions