modify
Merge branch 'master' of https://github.com/xstd/private_phone.git

Conflicts:
	android_code/project.properties
	android_code/src_lib/mcuslib/project.properties