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