diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-01-31 15:01:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-31 15:01:25 -0800 |
| commit | c63af6797475168709eaf9296f0fc15df291a730 (patch) | |
| tree | 98ad31a97e89dd377b23003ea0ab64a0ba636b23 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b240ecaf8a6bb86d12ee2d2ec692c6c96ccf51a5 (diff) | |
| parent | afddd2a070d21ca6a9a1fb1fb9cb8909bdd46036 (diff) | |
am 5131763c: am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
* commit '5131763c58be3ac78a28532261cdc8fc3af010ef':
stubs
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions