Signed-off-by: GitHubofLv <1002877809@qq.com>
Merge branch 'master' of git@github.com:hzc199307/CallManager.git

Conflicts:
	gen/com/xp/callmanager/R.java
	project.properties


Signed-off-by: GitHubofLv <1002877809@qq.com>