| commit | ef4265682eab5a1512facc8c592e59c9cf2a6d44 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 18:13:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 18:13:35 2015 +0000 |
| tree | 9b47bd6658919c702de5aa1afb6191b337474693 | |
| parent | 1a053a0ae002cdda31c39d4c7447b1f7e65dfec6 [diff] | |
| parent | 3b7ca5d1a28c6b20480a9854e519ab8d61cfa496 [diff] |
am 3b7ca5d1: am efc51f0f: am 93a8df0e: am 61934faf: am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp * commit '3b7ca5d1a28c6b20480a9854e519ab8d61cfa496': Prevent integer overflow when processing covr MPEG4 atoms