test
Merge branch 'master' of https://github.com/jinyongjie/jyj_github
Merge branch 'master' of https://github.com/jinyongjie/jyj_github

Conflicts:
	android_browser/browser_main/AndroidManifest.xml
	android_browser/browser_main/gen/com/example/browser_main/R.java
	android_browser/browser_main/gen/com/example/browser_navigation_page/R.java
	android_browser/browser_main/res/layout/activity_main.xml
	android_browser/browser_main/src/com/example/browser_main/MainActivity.java
合并