| commit | f6bd712c8c252733f9d033ef60219ff1de9342ad | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Mar 14 00:40:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 00:40:22 2014 +0000 |
| tree | 5deae970692f7c38d16c6e0855e16701eac52cb5 | |
| parent | 6e57e4ddc73da69e1f7e8907e6c498e7407e3c39 [diff] | |
| parent | 70cc5bdc0fca3f67f3602f04152c29323cad99df [diff] |
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.