malong
Merge branch 'master' of github.com:lifang/fuxin_android
malong
Merge branch 'master' of github.com:lifang/fuxin_android
malong
Merge branch 'master' of github.com:lifang/fuxin_android

Conflicts:
	gen/cn/trinea/android/common/R.java
	gen/com/fuwu/mobileim/R.java
	project.properties
	res/layout-1280x720/chat_info.xml
	res/layout-1920x1080/chat_info.xml