| commit | 7280b02e6dddca91c9b7004853ce633c14a129d6 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Fri Jul 31 20:23:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 20:23:43 2015 +0000 |
| tree | cf1bcd5eedef273019c889ae3efc864d2bbec9c6 | |
| parent | 4eba6fd38a27c3475cc46064fba7658c96f19809 [diff] | |
| parent | 4829dea8ea4b91d51d8cb56f6124e9a4e0cd04f2 [diff] |
am 4829dea8: Merge "Fix multiple division-by-zero conditions in MPEG4 parsing" * commit '4829dea8ea4b91d51d8cb56f6124e9a4e0cd04f2': Fix multiple division-by-zero conditions in MPEG4 parsing