| commit | 94012bc3068816adf348bac7b1ffd477c6e34600 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 17:38:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 17:38:04 2015 +0000 |
| tree | b62ef0d8d86dd5a159fda3997b7b7369ced8a96c | |
| parent | d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3 [diff] | |
| parent | ffe509ffb243462597eb018a623241739d032be1 [diff] |
am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp * commit 'ffe509ffb243462597eb018a623241739d032be1': Prevent integer overflow when processing covr MPEG4 atoms