| commit | 5a5e2f411caee5017ef6f2b54c031621a8269c27 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Apr 09 15:00:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 15:00:25 2015 +0000 |
| tree | 3a7e891f83f7a67bdcf73a0e58eca5f21d9020ed | |
| parent | e849af8737d9302a7b24fa2f0083cde01c9cd4fc [diff] | |
| parent | 1c4eddb16146855723d5854078ad0f6884f3f3f2 [diff] |
am 1c4eddb1: Merge "Fix div zero error in corrupted media file" * commit '1c4eddb16146855723d5854078ad0f6884f3f3f2': Fix div zero error in corrupted media file