提交
Merge branch 'master' of https://github.com/703510680/study_Android.git

Conflicts:
	New_xcky/res/layout/activity_main.xml
	New_xcky/res/layout/frame_jiekan.xml