OSDN Git Service

am 9f3f0fa0: (-s ours) am a5624237: am 8d2c6b83: Merge "Skip bitmaps with 0 dimension...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)
* commit '9f3f0fa035288787d7f64e110704080dc89688a9':


Trivial merge