diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-14 13:49:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 13:49:56 -0700 |
| commit | 078418eccda820d49c626b39ec95da60c20c3274 (patch) | |
| tree | a86fbca9a6c2aebc8cc8c558d932c3e4ed9d2744 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e5588e132b180f8ef32d2322be51d96d76d05711 (diff) | |
| parent | 1e588cfedcf8689d70165313d199940dbb7c4a44 (diff) | |
am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
Merge commit '3d52305faa682366eb34c30892ddd2b390940048' into kraken
* commit '3d52305faa682366eb34c30892ddd2b390940048':
Doc change: adjustments to the api changes description
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions