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)
commit70cc5bdc0fca3f67f3602f04152c29323cad99df
treea3eec354972f67724f83fc3fa89b7c3eecc655e7
parent67a10c522898d8223f5a2d389a846b7e2327148a
parent7d3044d64294cca6fadd184648a57185e92cf5c6
Merge changes Ic46e3069,Idc92716b into klp-dev

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