tree d20dd7448d2f0bfb6bbac56fbdc5a96a01b01599
parent 5ce204a6362840fe28aa762693edaab3d0da8718
parent 333ceb4f66ccf790081026f645474e07d832fbdb
author Lajos Molnar <lajos@google.com> 1395429607 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395429607 +0000

am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '333ceb4f66ccf790081026f645474e07d832fbdb':
  DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.