Signed-off-by: hzc199307 <hzc199307@qq.com>

冲突合并
Signed-off-by: Zhichao <Zhichao@hezhichao>
Merge branch 'master' of git@github.com:hzc199307/CallManager.git

Conflicts:
	gen/com/xp/callmanager/R.java
	res/layout/activity_business.xml