Signed-off-by: yesheng <a896574123@163.com>
Merge branch 'master' of https://github.com/2568295130/study_Android.git

Conflicts:
	DemoPro/src/com/yesheng/util/Utils.java