diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-02 14:02:59 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-11-02 14:02:59 -0700 |
| commit | 49bcf3e8b6b72b646a89d6cdec3aea1a80bb1238 (patch) | |
| tree | 099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3166db09941fce8c340f80900cc7d8f3d92fd583 (diff) | |
| parent | 1e04f5b26cec7705b893a13b6b83b7725e9b5f35 (diff) | |
resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions