diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-14 00:40:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 00:40:22 +0000 |
| commit | f6bd712c8c252733f9d033ef60219ff1de9342ad (patch) | |
| tree | 5deae970692f7c38d16c6e0855e16701eac52cb5 /media/libmediaplayerservice | |
| parent | 6e57e4ddc73da69e1f7e8907e6c498e7407e3c39 (diff) | |
| parent | 70cc5bdc0fca3f67f3602f04152c29323cad99df (diff) | |
| download | frameworks_av-f6bd712c8c252733f9d033ef60219ff1de9342ad.zip frameworks_av-f6bd712c8c252733f9d033ef60219ff1de9342ad.tar.gz frameworks_av-f6bd712c8c252733f9d033ef60219ff1de9342ad.tar.bz2 | |
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.
Diffstat (limited to 'media/libmediaplayerservice')
0 files changed, 0 insertions, 0 deletions