diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 12:08:40 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 12:08:40 -0700 |
| commit | 4be6b11700a1d45ff6b609e77e09d42f75188c09 (patch) | |
| tree | 1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d03f163cf91120cf1d8afe3321219f290952d866 (diff) | |
| parent | 879e1ceecb08a7e7f2addcd3646491b3283d26af (diff) | |
resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions