OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5dd0a57
a4c5bc0
)
am b7c8e918: Add support for HLS playlists of type \'event\'.
author
Andreas Huber
<andih@google.com>
Wed, 28 Nov 2012 17:42:18 +0000
(09:42 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 28 Nov 2012 17:42:18 +0000
(09:42 -0800)
* commit '
b7c8e91880463ff4981e3e53e98e45d68e2fe374
':
Add support for HLS playlists of type 'event'.
Trivial merge