"LRX22D"
"LRX22E"
DO NOT MERGE.  Bump version to 5.0.2.

Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775
"LRX22F"
LRX22G
core: Enable -mcpu=cortex-a8 flag for Scorpion cpu variant

To be used with
	http://review.cyanogenmod.org/#/c/77758/

Change-Id: I7ecc4707fa45bd7098165615c0521a12c85fb087
buildinfo: only set ro.build.product on non-unified devices

Change-Id: I5dccba2172dade3dacc55d832a2042fce306b5f5
core: Enable -mcpu=cortex-a9 flag for Cortex-A9 cpu variant

Change-Id: I9294a518bcdc21ccbae72eadd9f3c1a12982d028

add missing endif

Change-Id: I81003c5163e7ec9a55b9ec8160e68dd20531a7a2
Signed-off-by: cj360 <ayunker551@gmail.com>
build: Parse TARGET_COPY_FILES_OVERRIDES late in setup

Change-Id: I6f9c4fcfa8f18ecfd4dc8a503120960bf2fcdfe6
Signed-off-by: cj360 <ayunker551@gmail.com>
build: Fix QCOM_BSP_LEGACY cflags

Change-Id: I880f32892d9e082e3ba92878414f3cb3c6f08066
build: Clean up QCOM flag definitions

Change-Id: I66bca2db83260ccd65b82e540ee9f7961f00b030
Signed-off-by: cj360 <ayunker551@gmail.com>

Conflicts:
	core/qcom_target.mk
build: Add QCOM flags to Clang CFLAGS

Change-Id: I56f0d4106f5d3d27c1ace744d30c1c81f0052bbd
Merge remote-tracking branch 'aosp/lollipop-release' into aospal
Merge branch 'lollipop' of https://github.com/AOSPA-legacy/android_build into lollipop

Conflicts:
	core/config.mk

Change-Id: Iee77fceea8a68fafcc0ad6513db9eead52511c68