diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-25 10:41:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 10:41:55 -0700 |
| commit | 9928d1b038580187337e605cd5ed0554c88f1fca (patch) | |
| tree | 3d7a6ea3e640e88684325b18b52731badb53d295 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 455d50052446392a7d758f89c80668f61666dd0b (diff) | |
| parent | 3734308dd59c48ac533713bd0ef3a9699c008825 (diff) | |
am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'
* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
Fix the simulator build.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions