Citivas added
add all layouts of tk
layouts
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA

Conflicts:
	bin/CSSA.apk
	bin/classes.dex
	bin/classes/com/example/hitboss/R$layout.class
	bin/classes/com/example/hitboss/R$menu.class
	bin/classes/com/example/hitboss/R$string.class
	bin/resources.ap_
	gen/com/example/hitboss/R.java
R added
Bin and gen deleted
activity added
Revert
Index