diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-03-31 14:49:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 14:49:19 -0700 |
| commit | 546b1e065ff81a73bed7de448ee681e560b5001e (patch) | |
| tree | 53045ab4814fdaaa54ddbdbf0830bc7f0b51a223 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ad19edbdcd1c86f0eaabbb1685368adc11c3dcb4 (diff) | |
| parent | ebec5d195f3e5ba526576b56ac78704cb03a2916 (diff) | |
am d1a1ea05: am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
Merge commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979' into kraken
* commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979':
doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions