diff options
author | Dirk Dougherty <ddougherty@google.com> | 2009-12-17 10:33:23 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:33:23 -0800 |
commit | eb21ecf7bc46bdc6bd9eec38b0fc4a5eebcabc3b (patch) | |
tree | 7d5330152c49ca35fd3948d913acff0edebb6230 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | e8145f4fa34372d4015aab56321fcc2eabec62cf (diff) | |
parent | 9f64b89d8e5d7973649b193fb84b161cad051521 (diff) |
am 24780ea6: Merge change I75bb4c98 into eclair
Merge commit '24780ea60fab2c7fb399c88cd51151eccbbf383f' into eclair-plus-aosp
* commit '24780ea60fab2c7fb399c88cd51151eccbbf383f':
doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions