diff options
| author | Costin Manolache <costin@google.com> | 2010-05-12 19:10:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 19:10:01 -0700 |
| commit | d4625066eb79dcf356909a186970319776031aba (patch) | |
| tree | 518dc79eca47892a2d69747cb6e5e30c49ab2f9e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 673b56b41f32b613d21368a6207cda955db0033f (diff) | |
| parent | 58ed31eafec12e4c4a77405c93671cb888fe837e (diff) | |
am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken
* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
Bug 2680071: Rename the Cloud to Device
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions