diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-14 17:52:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 17:52:40 +0000 |
| commit | 59892ddb5254a3b38c8efca6c4c70722d4b942e6 (patch) | |
| tree | 68c0bba9cf7fdabc1838887cfa8165f24cc45c65 /media/mediaserver | |
| parent | 0064b508dc9b5cf6b37ac786c1e01c8d8c4ca868 (diff) | |
| parent | fa243e07f062058e7df01c052eb79086c21fbdbc (diff) | |
| download | frameworks_av-59892ddb5254a3b38c8efca6c4c70722d4b942e6.zip frameworks_av-59892ddb5254a3b38c8efca6c4c70722d4b942e6.tar.gz frameworks_av-59892ddb5254a3b38c8efca6c4c70722d4b942e6.tar.bz2 | |
am fa243e07: am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
* commit 'fa243e07f062058e7df01c052eb79086c21fbdbc':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
Diffstat (limited to 'media/mediaserver')
0 files changed, 0 insertions, 0 deletions