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 | 8bf08a636ca5796285de1c74968fc2cfd715fe14 (patch) | |
tree | 7d5330152c49ca35fd3948d913acff0edebb6230 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 23cc0908a81ce3fc4ecdd8d95cfa898496422596 (diff) | |
parent | 39cb8b4cc20e5567e44ae9f959cca1409b86e056 (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