diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-12-16 12:16:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-16 12:16:24 -0800 |
| commit | b43b35a034ad667ba749270537155e7534906153 (patch) | |
| tree | 3d3d3c6f6decb5f03b725fbc4e41c805eebeef64 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 18a27886952ba7fb78174508c5348959b31a73ef (diff) | |
| parent | e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3 (diff) | |
am e6547423: Merge change I10073d50 into eclair
Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp
* commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3':
Add Annotation for optional features.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions