smba1002->smba1004
Merge branch 'CM-10.1' of https://github.com/foric27/android_device_smba1002 into CM-10.1

Conflicts:
	full_smba1004.mk
	smba1004-modules.mk

Signed-off-by: foric27 <forc27101992@gmail.com>