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