OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 370c36a 8577a7d)
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)
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp

* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help