Set up manifest
Merge branch 'kk44' of github.com:BS-Harmony-S4/android into kk44

Conflicts:
	default.xml