diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-23 10:21:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 10:21:49 -0700 |
| commit | 8d54f983ba0204062d775347e61f80b1d5992d7a (patch) | |
| tree | cc49bbb8abf379490d8a487b9e8b36e43e5ecb3b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 58f6c371d7c7b5d789622d86353bf9ef22a5ec28 (diff) | |
| parent | fc445ebe8b45b75d935c83702410f882d6a587c1 (diff) | |
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
* commit '9d9a7466cd051748ba656acd39265099294c4153':
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