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 | c195965893da2003a3da9936391c27db05d47dd8 (patch) | |
| tree | f8be3b34d4e98e489df4291add007bff402d065b /opengl/java/android/opengl/Texture.java | |
| parent | 75181b42c97bc0e7eab11991cd45d3f83ad9f5d1 (diff) | |
| parent | fa2e3dcd855f573e160dbf258fd60a172b6e3f02 (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions