| commit | 299b45be0142c2bd7d527670724960f0854735e4 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 20 02:04:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 02:04:51 2015 +0000 |
| tree | bcdddf48ac422375ad01c533be22d99a356fb1e8 | |
| parent | e8314e1e558a72d0dbc0ffabd4f01b9a3051b476 [diff] | |
| parent | d76563f459661c82c1dd42c0dd8ec60bf2fa6019 [diff] |
am d76563f4: am eabd60a2: am 0742dd1d: am cce066d6: am 3459ea26: am de47cd3c: am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev * commit 'd76563f459661c82c1dd42c0dd8ec60bf2fa6019': MatroskaExtractor: detect infinite loop when parsing NALs