config & downloader services are not exportable
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

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