| commit | f555c47f1843b5a3557e18c16cb06b0ec06dcf34 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Mar 24 17:34:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 17:34:26 2014 +0000 |
| tree | 9a1b044149726ec242d3a5e948029d71803aaf7e | |
| parent | 2f5d0b32a8c5fcb03e4b0d55c53ff540052b5374 [diff] | |
| parent | ba1390335794a38472bf0349568bc4f199dc5c90 [diff] |
am ba139033: (-s ours) am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev * commit 'ba1390335794a38472bf0349568bc4f199dc5c90': DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.