| commit | 3b7ca5d1a28c6b20480a9854e519ab8d61cfa496 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 18:06:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 18:06:30 2015 +0000 |
| tree | 7f5c9ea6c0463b2580f380b9e6d298837d3a62bd | |
| parent | 6f3dc2f34ed8043d30937f436979ef360dcf3774 [diff] | |
| parent | efc51f0fe1d0ca66b42fc662168ce47543d69351 [diff] |
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 'efc51f0fe1d0ca66b42fc662168ce47543d69351': Prevent integer overflow when processing covr MPEG4 atoms