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