textview
Merge branch 'master' of ssh://git@github.com/kmarshj/jingli.git
左
Merge branch 'master' of ssh://git@github.com/kmarshj/jingli.git

Conflicts:
	src/com/zdht/jingli/MainActivity.java