| commit | 9d8c31188c0d0ff2d510899d785e73d97c2be243 | [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 | 7f913dbc82ecf8f93ec763fcb94d43f80e983a24 | |
| parent | 380ae0a6d491e04c2ddc86102ef7b753d402a35f [diff] | |
| parent | 90ce68a99f8803643d83be963aa0f28fa952a186 [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.