Merge remote-tracking branch 'origin/s1-dev-leoxie' into s1-dev-jfan
Merge remote-tracking branch 'origin/s1-dev-leoxie' into s1-dev-jfan
update
update homepage falllist
Merge branch 's1-dev-jfan' of inn:mediaplayerdev/liveplatform_android into s1-dev-leoxie
Stop Recording while on Error