diff options
| author | Dan Egnor <egnor@google.com> | 2009-11-24 17:29:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-24 17:29:30 -0800 |
| commit | 1ffa3c01a90f7e85aacb77163464b689d68f44cd (patch) | |
| tree | 118493bdaad588dd1c38cdfc6382344344517537 /opengl/java/android/opengl/Texture.java | |
| parent | 8bfa77b0e2de840678c026da0fc5ca1ce03d0c1a (diff) | |
| parent | ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16 (diff) | |
am ee6c7e49: Merge change I2c5380a6 into eclair-mr2
Merge commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16' into eclair-mr2-plus-aosp
* commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16':
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions