diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-23 09:52:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 09:52:41 -0700 |
| commit | fc445ebe8b45b75d935c83702410f882d6a587c1 (patch) | |
| tree | a261cac5a69ebbc5cf717395918b6e0cdf6cd0be /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bbe85a84bc4bd354efa28ee2853a869d2584b59c (diff) | |
| parent | e2ac5a6dfa788adab74f22862f99c677af9d47be (diff) | |
am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
Merge 2fae858d from Honeycomb-mr1. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions