OSDN Git Service

am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and...
authorJack Palevich <jackpal@google.com>
Mon, 11 Jan 2010 21:00:36 +0000 (13:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jan 2010 21:00:36 +0000 (13:00 -0800)
commitfd3f7d68af46fdd8e759faf532ce7f0df321f793
treeddc41f0d825137ada1578802ed4611ea23045eff
parenta7a02f9ecbdfde5ed50deb57720df94223cfba5a
parent91ea437c47ec1fde57746d757a46b8f56c9f3731
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.