fix bug#289

Open

CNlichao wants to merge 7 commits intoxhzengAIB:masterfrom

CNlichao:master

Commits on Oct 16, 2015

语音播放完成唤起第三方音乐

CNlichao
authored and
CNlichao
committed
Merge remote-tracking branch 'xhzengAIB/master'

CNlichao
authored and
CNlichao
committed
Revert "Merge remote-tracking branch 'xhzengAIB/master'"

CNlichao
authored and
CNlichao
committed

Commits on Oct 19, 2015

fix #256 发图片的时候，图片可能变形

CNlichao
authored and
CNlichao
committed
Revert "fix #256 发图片的时候，图片可能变形"

CNlichao
authored and
CNlichao
committed

Commits on Oct 23, 2015

fix #256 发图片的时候，图片可能变形

CNlichao
authored and
CNlichao
committed

Commits on Oct 28, 2015

Revert "Revert "Merge remote-tracking branch 'xhzengAIB/master'""
CNlichao
committed