tree 7845c43fd30484b450d101f924bc70d1b7f6c8f8
parent e86d28e4b13afeb7d0b84d556f05e8ddb2ece940
parent ea8db98aabd5233d8b7ca687f753bde2a069701a
author Gilles Debunne <debunne@google.com> 1280170866 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280170866 -0700

am d24ac171: am 8cd48574: Fixed bug in BitmapFactory.decodeStream

Merge commit 'd24ac17121b23efb17219f355e5dd38f933352ff'

* commit 'd24ac17121b23efb17219f355e5dd38f933352ff':
  Fixed bug in BitmapFactory.decodeStream