| commit | 91ea437c47ec1fde57746d757a46b8f56c9f3731 | [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 | 02e006c44a49085c3359169c33b2dcaed4d96203 | |
| parent | 370c36a17559166d7b21beb42ccbabd332b813ae [diff] | |
| parent | 8577a7d4521a17ca3836ca0656f771072dfd66c9 [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.