diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-12-15 07:40:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 07:40:02 -0800 |
| commit | 479a49f74f77855825ba69b105c065422c24246a (patch) | |
| tree | 64cebf215bf8f028573e63a4fcbd6ff4fc4376e3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bdcb2b71bd6f27b0576e9cb19ad36af245e982d6 (diff) | |
| parent | 7585586ce5b5de699b95125672e29eaf70876727 (diff) | |
am 7585586c: Merge change Ib1eb2e9e into eclair
Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp
* commit '7585586ce5b5de699b95125672e29eaf70876727':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions