diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-17 16:25:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 16:25:07 -0700 |
| commit | 72551f34aff28f2e8e34cc0231d9ebc5ec34bcfc (patch) | |
| tree | a7502118c6abd0c1aa64eba593b5e63aba3715fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5f9fd46d006823133b2ebfd5809649025b8d7434 (diff) | |
| parent | c8f07bae1fb0a690d95008e18797aaefd58c4f62 (diff) | |
am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
* commit '3a90ec4e6b4973f56dae825c967bbee69e6239cf':
Merge 67450db0 from honeycomb. Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions