diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-28 17:36:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 17:36:56 -0700 |
| commit | af3b2ca6d4912ec8ab01ee8503a1825ebc40ec5b (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 848e86bf29374ceffb9b4a7850ff5a940fc57323 (diff) | |
| parent | 2121f3cd04b18041e004e2003488703ef9245afe (diff) | |
am 0d0dc6a7: (-s ours) am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread
Merge commit '0d0dc6a70cbe0d7bfb795f937d6594711140b4b1'
* commit '0d0dc6a70cbe0d7bfb795f937d6594711140b4b1':
New assets. DO NOT MERGE>
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions