add camise to devtree
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp

Conflicts:
	jordan.mk
add camise to devtree
Merge branch 'kitkat-aosp' into defy-4.4-2.6.32