| commit | 90ce68a99f8803643d83be963aa0f28fa952a186 | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Sat Jan 09 21:54:28 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 09 21:54:28 2010 -0800 |
| tree | d2f31a370c677c5c21f997d40245c6127952c207 | |
| parent | 9c74295fb16da0469304a7c04c471915e28d09bd [diff] | |
| parent | 6d0f6c78037225ef5648d10e45a513a2e7c612b5 [diff] |
am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp * commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5': DO NOT MERGE A library for encoding and decoding ETC1 textures.