diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-13 21:32:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-13 21:32:21 -0700 |
| commit | dee7dcb4c31e582b18fd242dae7985f78de7095d (patch) | |
| tree | 028086af264a1d96a17a8623d823a1923ba12af9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 706ca4bcea86bb1dfbdd00acba4fac3137f8f5a7 (diff) | |
| parent | 32374efa5fde7f902e8bd59dba2c407a4001f6a8 (diff) | |
am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp
* commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
Doc change: adjustments for ndk feature description
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
