diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 12:01:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 12:01:24 -0700 |
| commit | 0c28c853fd51c47fdc03870e1ee937f707d103db (patch) | |
| tree | 0b5d35ae7bacd0837b7d778ce90367bed325b021 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b43920ce4eb70789d1cb8d2143aab954ccb370e5 (diff) | |
| parent | 47b876d150ac6ae44253e5c51a92441fe8e6753c (diff) | |
am 9cb1acda: (-s ours) am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
* commit '9cb1acda89919a46583444f788f4808fecd5d78d':
Merge c12b4093 from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions