OSDN Git Service

am ffbc540c: (-s ours) am 3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.
authorPatrick Scott <phanna@android.com>
Sun, 10 Oct 2010 19:48:47 +0000 (12:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 10 Oct 2010 19:48:47 +0000 (12:48 -0700)
Merge commit 'ffbc540cfff9dfbd5909d7731c143f5d1181bbf1'

* commit 'ffbc540cfff9dfbd5909d7731c143f5d1181bbf1':
  Revert to skia's decoder for gifs with 1 frame.


Trivial merge