Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	AndroidManifest.xml