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