tree 8c7369002f0f349dcd32ac965e1fcebc324673bd
parent 4991b63c878b146a06a3b47b14f4d83a1842ead5
parent a5fa3b21247ef211eb8225aec96cb7683d161ed2
author Qiwen Zhao <zhao@google.com> 1415844811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415844811 +0000

am a5fa3b21: am 52d378bc: Merge commit \'698997b9ef47f215350f03c0289f291846cd3604\' into lmp-mr1-dev

* commit 'a5fa3b21247ef211eb8225aec96cb7683d161ed2':
  Add null check for exif thumbnail size