1.解决bug
Merge branch 'master' of https://github.com/taugin/callassistant.git

Conflicts:
	src/com/android/callassistant/CrashHandler.java