| commit | d76563f459661c82c1dd42c0dd8ec60bf2fa6019 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 20 01:40:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:40:04 2015 +0000 |
| tree | d1d7951b388445d64b5724873b22959255bf0efa | |
| parent | ed0c67a8d0e501bd02c8eb811dfcb215a8c47ada [diff] | |
| parent | eabd60a281b7546df98efbde091d13f6761f968f [diff] |
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 'eabd60a281b7546df98efbde091d13f6761f968f': MatroskaExtractor: detect infinite loop when parsing NALs