| commit | fd3f7d68af46fdd8e759faf532ce7f0df321f793 | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Mon Jan 11 13:00:36 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 11 13:00:36 2010 -0800 |
| tree | ddc41f0d825137ada1578802ed4611ea23045eff | |
| parent | a7a02f9ecbdfde5ed50deb57720df94223cfba5a [diff] | |
| parent | 91ea437c47ec1fde57746d757a46b8f56c9f3731 [diff] |
am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair Merge commit '90ce68a99f8803643d83be963aa0f28fa952a186' * commit '90ce68a99f8803643d83be963aa0f28fa952a186': DO NOT MERGE A library for encoding and decoding ETC1 textures.