diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 11:57:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:57:35 -0700 |
| commit | 7f0dbabda93c16b6593fb0b9a88c1bf121baee0c (patch) | |
| tree | ad3cf2304e44d77a583ac28ff560bf9310fffd1a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 47b876d150ac6ae44253e5c51a92441fe8e6753c (diff) | |
| parent | acfbfbc079f29a640aee20655831a1338bcad312 (diff) | |
am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
* commit 'f89c37295db5df34c014e0791c976cfa94509068':
Merge 6f2fb570 from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions