common styles for master & ics builds
common styles for master & ics builds
Merge branch 'master' into ice-cream-sandwich

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