diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-12 07:55:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:55:17 -0700 |
| commit | c36408479d4b08fc53bccf9b9b5f4515ec921c99 (patch) | |
| tree | 8a093c05800b77519a2cc7592aa0c0da2f1617e8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8e6e343099ba06f24f96aaab902693f16d944bf1 (diff) | |
| parent | e0aa23a970654e1dc4a57f1603e856ea23da6dc6 (diff) | |
am 6d405cfc: am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
Merge commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3' into kraken
* commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3':
Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions