initial
fix prop override call
Merge branch 'lollipop' of https://github.com/grogg/platform_device_lge_hammerhead into lollipop

Conflicts:
	full_hammerhead.mk
fix prop override call