setup
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
update to latest kk
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Version bumpe from 1.1-2 to 1.1-3
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Update to 1.1-4
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk

Conflicts:
	config/common.mk
Fixed file updates
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk