Signed-off-by: LiShuai <80817774@qq.com>
Merge branch 'master' of https://github.com/lishuaijuly/vivi-android.git


Signed-off-by: LiShuai <80817774@qq.com>