diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-23 09:52:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 09:52:52 -0700 |
| commit | 03f2861caec5b0811d9148c92fc9b1b740f684dd (patch) | |
| tree | a261cac5a69ebbc5cf717395918b6e0cdf6cd0be /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fc445ebe8b45b75d935c83702410f882d6a587c1 (diff) | |
| parent | 8949eabac7bdbd8bb17aeae6bd8bd23a0c63f2b9 (diff) | |
am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
Merge 05b7b69c from honeycomb-mr1. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions