modified:   AndroidProducts.mk
	modified:   device.mk
	renamed:    ax.mk -> pap.mk
	renamed:    ax_enrc2b.mk -> pap_enrc2b.mk
	modified:   vendorsetup.sh

Conflicts:
	pap.mk
	pap_enrc2b.mk

	modified:   device.mk
	modified:   pap.mk
	modified:   pap_enrc2b.mk
Back to the AOSP keys