new
newnew
Merge branch 'master' of https://github.com/sisivip/TimeMachine

Conflicts:
	bin/classes.dex
	bin/classes/com/timemachine/main/DiaryPublish$1.class
	bin/classes/com/timemachine/main/DiaryPublish$2.class
	bin/classes/com/timemachine/main/DiaryPublish$3.class
	bin/classes/com/timemachine/main/DiaryPublish$4.class
	bin/classes/com/timemachine/main/DiaryPublish$5.class
	bin/classes/com/timemachine/main/DiaryPublish$6.class
	bin/classes/com/timemachine/main/DiaryPublish$7.class
	bin/classes/com/timemachine/main/DiaryPublish$8.class
	bin/classes/com/timemachine/main/DiaryPublish$9.class
	bin/classes/com/timemachine/main/DiaryPublish.class
	bin/classes/com/timemachine/main/ListMain.class
	bin/classes/com/timemachine/main/R$color.class
	bin/classes/com/timemachine/main/R$dimen.class
	bin/classes/com/timemachine/main/R$drawable.class
	bin/classes/com/timemachine/main/R$id.class
	bin/classes/com/timemachine/main/R$layout.class
	bin/classes/com/timemachine/main/R$menu.class
	bin/classes/com/timemachine/main/R$string.class
	bin/classes/com/timemachine/main/R$style.class
	bin/resources.ap_
	gen/com/timemachine/main/R.java