am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding...
am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Merge commit '90ce68a9'
* commit '90ce68a9':
DO NOT MERGE A library for encoding and decoding ETC1 textures.