OSDN Git Service

am ec2d1b8f: (-s ours) am 84d83ba8: Merge "DO NOT MERGE Tool for compressing/decompre...
authorJack Palevich <jackpal@google.com>
Mon, 11 Jan 2010 20:59:42 +0000 (12:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jan 2010 20:59:42 +0000 (12:59 -0800)
commit6e05fd45b23b3ce41c3aa76336dfe6e30e6f2efe
treea25a6c24a8e654042cffc179dba9070288405bac
parent7bd02c7da4c0899e54e6c5b39e3eda94d212b371
parent973e609374af7518d44cdd9aa4a68bec4c94c860
am ec2d1b8f: (-s ours) am 84d83ba8: Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair

Merge commit 'ec2d1b8fb02ce14222b41afb803e29e409d80d67'

* commit 'ec2d1b8fb02ce14222b41afb803e29e409d80d67':
  DO NOT MERGE Tool for compressing/decompressing ETC1 textures.