tree 6aa6de55a5e0e271dd3a7240245ffe0d8393f6ce
parent a0b94395dc82c90ca437bb6fed7aa01fcbbffffe
parent 466786b25b262f4f6e5737b3a88e8d7f6916e45c
author Lajos Molnar <lajos@google.com> 1394774073 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394774073 +0000

am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '466786b25b262f4f6e5737b3a88e8d7f6916e45c':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.