Merge branch 'Kagami-vlive-hls'
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 29 Apr 2016 11:30:51 +0000 (19:30 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 29 Apr 2016 11:30:51 +0000 (19:30 +0800)

Trivial merge