OSDN Git Service

am b7c8e918: Add support for HLS playlists of type \'event\'.
authorAndreas Huber <andih@google.com>
Wed, 28 Nov 2012 17:42:18 +0000 (09:42 -0800)
committerAndroid 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