diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-14 04:10:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 04:10:37 +0000 |
| commit | 466786b25b262f4f6e5737b3a88e8d7f6916e45c (patch) | |
| tree | 087a22072dafb9f57e217db19a3a62deced90009 /drm | |
| parent | 5b297ba76271e8554758cbd569e73720bc914af6 (diff) | |
| parent | 70cc5bdc0fca3f67f3602f04152c29323cad99df (diff) | |
| download | frameworks_av-466786b25b262f4f6e5737b3a88e8d7f6916e45c.zip frameworks_av-466786b25b262f4f6e5737b3a88e8d7f6916e45c.tar.gz frameworks_av-466786b25b262f4f6e5737b3a88e8d7f6916e45c.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 'drm')
0 files changed, 0 insertions, 0 deletions