| commit | 93a8df0e9d9f9e7b42d88165605cdb34262454b2 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 17:51:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 17:51:07 2015 +0000 |
| tree | d36d04836ff5f7f2611b95a37fa0b2e8ef06f245 | |
| parent | b449e46904854eccea79a40e16b2ba5132611bf3 [diff] | |
| parent | 61934fafa7e68c2adbf50412c3d524ea5ec4ed1d [diff] |
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 '61934fafa7e68c2adbf50412c3d524ea5ec4ed1d': Prevent integer overflow when processing covr MPEG4 atoms