OSDN Git Service

Merge changes Ic46e3069,Idc92716b into klp-dev
authorLajos Molnar <lajos@google.com>
Wed, 12 Mar 2014 20:58:37 +0000 (20:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Mar 2014 20:58:37 +0000 (20:58 +0000)
* changes:
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.


Trivial merge