new file:   liquid.mk
Merge branch 'cm-10.1' of git://github.com/razrqcom-dev-team/android_device_motorola_msm8960-common into liquid
	deleted:    cm.mk
	modified:   liquid.mk
Merge https://github.com/jsnweitzel/android_device_motorola_msm8960-common into liquid