From: Lajos Molnar <lajos@google.com>
Date: Wed, 12 Mar 2014 20:58:37 +0000 (+0000)
Subject: Merge changes Ic46e3069,Idc92716b into klp-dev
X-Git-Tag: android-x86-4.4-r2^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=70cc5bdc;p=android-x86%2Fframeworks-av.git

Merge changes Ic46e3069,Idc92716b into klp-dev

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

70cc5bdc0fca3f67f3602f04152c29323cad99df