Signed-off-by: lishuai03 <lishuai03@D7B1C15BC7566EF.internal.baidu.com>
Merge branch 'newbranch' of https://github.com/lishuaijuly/vivi-android.git into newbranch