| commit | 45b821dfa69a974f57c3ff00e1764e080fb050ea | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 18:19:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 18:19:40 2015 +0000 |
| tree | b9f2321a4c7b5d2b2f91322cfe322c9f3d622f53 | |
| parent | 2ca9865ea0c8124c6cbb48c023aec267d3e78978 [diff] | |
| parent | ef4265682eab5a1512facc8c592e59c9cf2a6d44 [diff] |
am ef426568: 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 'ef4265682eab5a1512facc8c592e59c9cf2a6d44': Prevent integer overflow when processing covr MPEG4 atoms