diff options
| author | Scott Main <smain@google.com> | 2010-05-10 09:58:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 09:58:30 -0700 |
| commit | 5bc546043e9395d96874dd6b7bd2f86bae8bbf87 (patch) | |
| tree | b013fbb9d1d2f493488ba7f3fcebca98f88110c1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 47cd058b5fae1a5ecb338d6108c6a64bfac5a443 (diff) | |
| parent | 4f3fbc22bb7b01520d72e1d2a8046e5590bfed3a (diff) | |
am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Merge commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08' into kraken
* commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08':
docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions