diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-17 16:27:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 16:27:42 -0700 |
| commit | 23d088139ddd03704c6b70580233820e3ef58cc5 (patch) | |
| tree | 2429767bc71baa52bf6f41add0485c805e633115 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 158b7f0fbae269b63b94515eee14ab66f945897b (diff) | |
| parent | 72551f34aff28f2e8e34cc0231d9ebc5ec34bcfc (diff) | |
am 68957a0d: (-s ours) am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
* commit '68957a0d7516c82b8cb4050f15294c663bf08338':
Merge 67450db0 from honeycomb. Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions