| commit | a421314f9cc1b061d94a79e2aa1a92916ea4b9bf | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 16:13:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 16:13:44 2015 +0000 |
| tree | 5b646ab51becb775e3fefe2ff43850bb5cbb064f | |
| parent | b0924c631cfccd10c1f95d6ae44c8cd852e14a9f [diff] | |
| parent | 430475da7f0edb86ee6a85378d1583ab07f7f93d [diff] |
am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp * commit '430475da7f0edb86ee6a85378d1583ab07f7f93d': Prevent integer overflow when processing covr MPEG4 atoms