Initial Commit
Merge remote-tracking branch 'tr/kk44' into HEAD

Conflicts:
	device.mk
	system.prop

Change-Id: Id8b42c9423e6d66388a4019d73ad7c8391f9cc03