version number => 1.7.9
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml