OK
OK
uu
hello
ddd
Merge branch 'master' of https://github.com/sisivip/TimeMachine

Conflicts:
	AndroidManifest.xml