新分支
T2
Master
T22
Merge branch 't2'

Conflicts:
	Training/src/com/hinyon/t1/MainActivity.java