ca
Merge branch 'fenzhi'

Conflicts:
	togoandroidDemo/bin/classes/com/example/togodemo/aaa.class
	togoandroidDemo/src/com/example/togodemo/aaa.java
aa