kkj
test
Merge branch 'master' of https://github.com/istoneyou/AndroidLearning

Conflicts:
	TestStone/src/com/example/teststone/MainActivity.java
test