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

Conflicts:
	New_xcky/res/layout-land/frame_analysis.xml
	New_xcky/res/layout-land/frame_suggest.xml
	New_xcky/res/values/strings.xml