diff options
| author | Scott Main <smain@google.com> | 2010-04-10 11:48:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:48:20 -0700 |
| commit | 02dd5476bb0c03b7c9a1cd8e90e44ee9065263a1 (patch) | |
| tree | c4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4c1e81598149bedc86aac165a9fc275478199c32 (diff) | |
| parent | d60b0ca1f58301472c82efe8c610c3142b2d6d1b (diff) | |
am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '67d6590d242397acbb95814139301d2e6efd3631' into kraken
* commit '67d6590d242397acbb95814139301d2e6efd3631':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions