OSDN Git Service

am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures...
authorJack Palevich <jackpal@google.com>
Sun, 10 Jan 2010 05:54:28 +0000 (21:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 10 Jan 2010 05:54:28 +0000 (21:54 -0800)
commit91ea437c47ec1fde57746d757a46b8f56c9f3731
tree02e006c44a49085c3359169c33b2dcaed4d96203
parent370c36a17559166d7b21beb42ccbabd332b813ae
parent8577a7d4521a17ca3836ca0656f771072dfd66c9
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.