diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-26 14:15:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-26 14:15:40 -0700 |
| commit | 9b2a2e94ca94b558dafaf4fcc50c445c70241d34 (patch) | |
| tree | a54f4e7df9f004f79abb683ac586ce1a4f63f6d6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ef5f3c2627028a99bc1a26d71375d61380c5742c (diff) | |
| parent | 6ece5d4c89bd8ebba3bc6e35c5d26be96c0dfe10 (diff) | |
am b643cbe5: (-s ours) am e0998604: Add necessary logic removed during backport
Merge commit 'b643cbe55852b01f1ab81da76d841b58d890276a'
* commit 'b643cbe55852b01f1ab81da76d841b58d890276a':
Add necessary logic removed during backport
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions