fix TARGET_USE_O3 (O != 0)
Merge pull request #6 from tonyp/patch-1

fix TARGET_USE_O3 (O != 0)
wow this has been double derped

Cheers aaron :)
Merge pull request #7 from tonyp/patch-2

wow this has been double derped
fix up the compiler flags for good

Commit 399cf571 has been completely fucked up, additionally to both my previous fixes (ifneq->ifeq, 0->O) the GLOBAL_CFLAGS and RELEASE_CFLAGS have been mixed up.
Due to the previous errors this one has been covered up, but now it leads to build errors for non-O3 builds. I didn't notice that until now as I've been testing the fixed O3 flag only.
Note that before my commits the compiler always used O3, regardless  of TARGET_USE_O3.

I've reordered and fixed the commit now, this should finally match the intention of @aaronpoweruser.
Merge pull request #8 from tonyp/patch-1

fix up the compiler flags for good
Add qcom_utils

Change-Id: I7c93d0d374307262c5fb1b077aa86cb0c1069ef1
build: Add support for extra kernel build variables

 * This allows specifying a variant defconfig, and an selinux defconfig
   which are simply configuration fragments.

Change-Id: I97882ae3b8c2e16ff6a7dce8dd3a70d70f8aa866

Conflicts:
	core/tasks/kernel.mk
Merge pull request #9 from garwynn/jellybean

build: Add support for extra kernel build variables
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_build into jellybean
new variable TARGET_RECOVERY_FSTAB

Currently the source file recovery.fstab has to be located
in $(TARGET_DEVICE_DIR)/recovery.fstab).

To allow multiple similar CM products to share one recovery.fstab
file this patch introduces the variable TARGET_RECOVERY_FSTAB.

Change-Id: I51961f5a1665023001c9857e13008a2ca44529ee

Conflicts:
	core/Makefile
Merge pull request #13 from slickrick/jellybean

new variable TARGET_RECOVERY_FSTAB
Revert "Add check for local OTA_FROM_TARGET_SCRIPT"

This reverts commit 9dc4e5bdfb1443b4050eb51c00f39dcb2f8a5a03.

Conflicts:
	core/Makefile
RoomService: update to use local_manifest/

*fixes deprectated practices

Change-Id: I0cac122fde2fa069324ed59b3c45bb62bb99029d
Merge branch 'jellybean-legacy' of https://github.com/ParanoidAndroid/android_build into HEAD

Conflicts:
	core/combo/select.mk
	core/qcom_utils.mk

Change-Id: Ibec4877311dd731f19ad4eb2b5296fde3c5c00d6