Convert to CM
Initial upload
Bringing PMEM inline with ION
BoardConfig: raising boot image partition size
Adding vendor/qcom/proprietary
Merge branch 'ion' into 'cm-10.1'
Merging branches
Derp
Derp
various shit, i cant even remember. probably not much.
not needed
Merge remote-tracking branch 'upstream/cfx4.2' into cm-10.1

Conflicts:
	BoardConfig.mk
	configs/media_profiles.xml
	device.mk
	overlay/frameworks/base/core/res/res/values/config.xml
	ramdisk/ueventd.primoc.rc
	vendorsetup.sh
Stop sneaking into here
Reverting to using codefirex msm7x30
Prebuilt default.prop
Part 2
lol fail, primoc is not an ace. silly me
Feex
Merge remote-tracking branch 'upstream/cfx4.2' into cm10.1

Conflicts:
	device.mk
	overlay/frameworks/base/core/res/res/values/config.xml
Get outta her