OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0064b50 fa243e0)
am fa243e07: am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
authorLajos Molnar <lajos@google.com>
Fri, 14 Mar 2014 17:52:40 +0000 (17:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 17:52:40 +0000 (17:52 +0000)
* commit 'fa243e07f062058e7df01c052eb79086c21fbdbc':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help