shit
Merge branch 'master' of https://github.com/BlakAndroid/platform_manifest

Conflicts:
	default.xml