tree 94b123871a71f682ade241f12c17d8f2964b8b29
parent 067dc16dfd1ed3fdb60aa9d867f0104330b2bb9a
parent 6a4db337c716d739c55b0c154eb16770a4b917e4
author Jay Shrauner <shrauner@google.com> 1393897617 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393897617 +0000

am 6a4db337: Merge "Fix NPE on non decodable Bitmap" into klp-dev

* commit '6a4db337c716d739c55b0c154eb16770a4b917e4':
  Fix NPE on non decodable Bitmap