local_maniest 'fix'
Merge branch 'kk' of https://github.com/CarbonDevXperia/hudson into kk

Conflicts:
	.repo/local_manifests/local_manifest.xml