| commit | ffe509ffb243462597eb018a623241739d032be1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 17:19:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 17:19:20 2015 +0000 |
| tree | b96386b9c3bf83c969ed207dbd7b53eb29e6c6a3 | |
| parent | f26400c9d01a0e2f71690d5ebc644270f098d590 [diff] | |
| parent | d0af1dedf5d903a52fac58f694b3f8edbf20e656 [diff] |
am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp * commit 'd0af1dedf5d903a52fac58f694b3f8edbf20e656': Prevent integer overflow when processing covr MPEG4 atoms