diff options
author | Dirk Dougherty <ddougherty@google.com> | 2009-12-17 10:34:54 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:34:54 -0800 |
commit | 2b91e370ee34ed55d4b3ba4a5579fb61fbf37300 (patch) | |
tree | 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 043a9e464ab70310985db49577d6e434dd0ed366 (diff) | |
parent | eb21ecf7bc46bdc6bd9eec38b0fc4a5eebcabc3b (diff) |
am fe3ad191: am 24780ea6: Merge change I75bb4c98 into eclair
Merge commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95'
* commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95':
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