OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7a02f9 91ea437)
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)
Merge commit '90ce68a99f8803643d83be963aa0f28fa952a186'

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


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