diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 12:05:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 12:05:46 -0700 |
| commit | 7d449d205ce454a5449bfae83e271e3702f322f6 (patch) | |
| tree | ad3cf2304e44d77a583ac28ff560bf9310fffd1a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3c10c7f02277585da94e68fb23823a22201899c7 (diff) | |
| parent | c0ab47832c01ecb66d2fa2d0a9ffe560a604a4e4 (diff) | |
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
* commit 'b7b877a45f469336703844a928482e6438442567':
Merge 9d76581f from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions