tree a06c75e6e39dcf955d281a29527ff890819ec594
parent f68098534e42b33cd4588bb2d2ba34ab579e11aa
parent b618b2ef8722964730d09a86a06a85ca34df6de4
author Brad Fitzpatrick <bradfitz@android.com> 1301498458 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301498458 -0700

am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"

* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils