lol fail, primoc is not an ace. silly me
Merge remote-tracking branch 'upstream/cfx4.2' into cm10.1

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