diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-12-01 06:31:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 06:31:09 -0800 |
| commit | 859bc0153e37a7eb65216c0a5f7ea46f5559b453 (patch) | |
| tree | 0fed812542ce9f29c2c329bfb8d360f7984e0b53 /opengl/java/android/opengl/Texture.java | |
| parent | 5a4e807af8661d35e27157fa224a8e4db0e66f7c (diff) | |
| parent | 2a40d0d92b208021b492e9af3d944720cbf269fc (diff) | |
am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
* commit '2a40d0d92b208021b492e9af3d944720cbf269fc':
Put screensavers back in the icebox for now. DO NOT MERGE.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions