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)
commit68835d687abe593fc3b0397364a3d40a17d1f71e
tree65310dd0a3c854401a156552be67ec1d57ffacf2
parent065216d94f59953a228d2683d3bafe4241fd1e29
parent9d186afac818645490122aa7457f247c31c601bf
Merge branch 'Kagami-vlive-hls'