commit | f5e633989263f03c469d676246fbf003f3bb1acc | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu Apr 09 15:15:59 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 15:15:59 2015 +0000 |
tree | ccf824296d111649d42cebb068d30041b830012e | |
parent | e5eda367571db5894024d0d71e3831484ef53141 [diff] | |
parent | 65b351c9e6b2de28d9517d90c42965d0fb3c5cd6 [diff] |
am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file" * commit '65b351c9e6b2de28d9517d90c42965d0fb3c5cd6': Fix div zero error in corrupted media file