OSDN Git Service

am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
authorLajos Molnar <lajos@google.com>
Fri, 14 Mar 2014 04:10:37 +0000 (04:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 04:10:37 +0000 (04:10 +0000)
commit466786b25b262f4f6e5737b3a88e8d7f6916e45c
tree087a22072dafb9f57e217db19a3a62deced90009
parent5b297ba76271e8554758cbd569e73720bc914af6
parent70cc5bdc0fca3f67f3602f04152c29323cad99df
am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '70cc5bdc0fca3f67f3602f04152c29323cad99df':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.
media/libstagefright/httplive/M3UParser.cpp