tree 33f5801e9c796a39a277fd93fef38b28b608fc27
parent 5dca099df7100c531e111b50435605c318f1e6d4
parent ab3977d21161815c130bdedf21e2571382d208da
author Marco Nelissen <marcone@google.com> 1398958094 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398958094 +0000

am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  MetadataRetriever: Check null pointer to avoid tombstone crash.