diff options
| author | Gilles Debunne <debunne@google.com> | 2011-02-09 12:19:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-09 12:19:46 -0800 |
| commit | 78fd484d9bf06aa4e7acdc8e4c02cf442554ebef (patch) | |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b14ac99db73cabd31f149c8a487115cdafd21290 (diff) | |
| parent | 2f630a5533cc991a33024e256714c323bcb37298 (diff) | |
am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
Fix for multiple merge problem.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions