1028 私有变量相关
1106
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestStack/AndroidManifest.xml
	TestStack/res/layout/main.xml
	TestStack/src/com/example/teststack/MainActivity.java