tree 841d8b8ed193f9dffc7f96f909bf33104f17fde4
parent 65e0123ced0a1891fc66e631de5ba3d1d5a515bf
parent ed86384591c0bf7ee2d227a6c56e85aa54bfaeac
author Andreas Huber <andih@google.com> 1366228498 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366228498 -0700

am ed863845: Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev

* commit 'ed86384591c0bf7ee2d227a6c56e85aa54bfaeac':
  Parse the last none-empty line of .m3u8 file