OSDN Git Service

am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support...
authorJean-Baptiste Queru <jbq@google.com>
Fri, 24 Jun 2011 19:20:24 +0000 (12:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Jun 2011 19:20:24 +0000 (12:20 -0700)
commitec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172
tree9834ac42fe413cca4a5b1070f54a37f74aed3dc6
parent9f1ef6d57bbf1ac524eff849c8976acb012b5687
parent99c070d8eb9f1ff9ea5c38991f15f091040226c2
am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
  Add WEBP to the list of Image formats that support Compression.
core/jni/android/graphics/Bitmap.cpp
graphics/java/android/graphics/Bitmap.java