diff options
| author | Scott Main <smain@google.com> | 2010-05-04 16:06:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-04 16:06:57 -0700 |
| commit | f3847f9b76a7d8ee01747f3cff06f874418f3423 (patch) | |
| tree | ed855078c90054b870b6effb1b1ea9f82f1fb200 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dea9058c555804a3edba82b4a5ba09b4d0968f53 (diff) | |
| parent | c224e598228cf0c9205c655590a96b1dda324d1e (diff) | |
am 0915d0aa: am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
Merge commit '0915d0aa9c13b365d48c6868ac47913ecd172d07' into kraken
* commit '0915d0aa9c13b365d48c6868ac47913ecd172d07':
docs: resolve doc bug
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions