tree d97838f1d697448b4b55c3485761518b3037ac7a
parent b6347ac62b36b4d9578d181ba83bf8e6446298e8
parent f5e633989263f03c469d676246fbf003f3bb1acc
author Marco Nelissen <marcone@google.com> 1428593193 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428593193 +0000

am f5e63398: am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"

* commit 'f5e633989263f03c469d676246fbf003f3bb1acc':
  Fix div zero error in corrupted media file