tree 12132c5fe69edfb9c2b95f7d92f70e24dcdca01e
parent 5f3594fbf67ecfdeae0719063d9416c984498768
parent 2ce4c3487389e3887c6ec085069422ad69cd570c
author Daniel Sandler <dsandler@google.com> 1257989463 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257989463 -0800

am 2ce4c348: am 0c5b5883: am 1325f557: Stop crashing on invalid wallpaper thumbnail images.

Merge commit '2ce4c3487389e3887c6ec085069422ad69cd570c'

* commit '2ce4c3487389e3887c6ec085069422ad69cd570c':
  Stop crashing on invalid wallpaper thumbnail images.