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