drop this duplicate line for recovery
	modified:   tools/releasetools/ota_from_target_files
let's dump the changelog when ridin dirty
	modified:   core/main.mk
Merge branch 'kitkat' of https://github.com/LiquidSmooth/android_build into ls-nozomi

Conflicts:
	tools/releasetools/ota_from_target_files