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

Conflicts:
	AndroidManifest.xml