diff options
| author | Scott Main <smain@google.com> | 2010-06-02 13:46:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-02 13:46:53 -0700 |
| commit | 3ee0388b810aaabfee191ac688df67993f1c00dd (patch) | |
| tree | a85071eb34a5dbf792ad54f2dcbf62b76e461d12 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f4a87686cccbb677749b7a5f385cdefc11e7a931 (diff) | |
| parent | a689e8ed4174fba1bbda89326685fca3edf1842d (diff) | |
am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '105e1c5adc3da14996d659ac403e7254b81bcb76' into kraken
* commit '105e1c5adc3da14996d659ac403e7254b81bcb76':
docs: a couple doc bug fixes
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions