diff options
| author | Scott Main <smain@google.com> | 2011-02-02 17:15:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 17:15:35 -0800 |
| commit | 5f5817a302ea482b621e5fd5fb25bb0320a198ee (patch) | |
| tree | 9deab5762327530c5c1a7dd5d39bd30fdd74ee74 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ecc5d4b2cd46f11de8e53ad5f9677299b9e8837a (diff) | |
| parent | 7f72086ffc43c2c979f18591e242612c3ebf655f (diff) | |
am 43bcbd87: am 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
* commit '43bcbd875843d80421f8b1fc777b8d6f5b9e967d':
wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions