tree 779c131090f21ba14b9bb5addff7952cbf6e932f
parent 0c990d4b9d873bfbbd3fc2a4127ff4efcde7f0b3
parent 523e762ad43aaacbf494d207b9556d4f827d26c2
author Michael Jurka <mikejurka@google.com> 1390565198 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390565198 -0800

am 523e762a: Merge "Catch exceptions if Exif is malformed" into ub-now-lunchbox

* commit '523e762ad43aaacbf494d207b9556d4f827d26c2':
  Catch exceptions if Exif is malformed