diff options
| author | Scott Main <smain@google.com> | 2010-05-12 07:56:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:56:01 -0700 |
| commit | 745ae5050942a270767380465525325b8c13cd1a (patch) | |
| tree | 19ab3fba69bd9bfeb70b2823e48cbd9e2a132068 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a2740229c8290c82aa42b56d02dce7b0fc5eaaeb (diff) | |
| parent | ee8cf6652af4d24879734c2fe6939d0a4ff81b0a (diff) | |
am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
Merge commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1' into kraken
* commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1':
docs: announce froyo and update IO message
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions