commit 3c8136b7735c318993335f684c43bd2543d06ec0
author Koushik Dutta <koushd@gmail.com> Mon Nov 28 07:45:10 2011 -0800
committer Koushik Dutta <koushd@gmail.com> Mon Nov 28 07:45:10 2011 -0800
tree d2b2ba8ddb7fcf066f7b4fcb78db46b34589e95d
parent c6f7a490657c093acf82003dd2ff6854615152b3
parent 0051ed6602f5a876f215fc0dd11f217344d68ba0

Merge branch 'ics' of git://github.com/CyanogenMod/android_vendor_cm into ics

Conflicts:
	config/common.mk

Change-Id: I6a26a57eda383ffdb51bfe89d4f5ea5dc7602bac

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index cff7f88..61abb70 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -55,3 +55,22 @@
     PhaseBeam
 
 PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
+
+PRODUCT_VERSION_MAJOR = 9
+PRODUCT_VERSION_MINOR = 0
+PRODUCT_VERSION_MAINTENANCE = 0-RC0
+
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=ITL41D
+
+ifdef CM_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
+else
+    ifdef CM_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
+    endif
+endif

config/common_versions.mk

diff --git a/config/common_versions.mk b/config/common_versions.mk
deleted file mode 100644
index 24f360d..0000000
--- a/config/common_versions.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-PRODUCT_BRAND := cm
-
-PRODUCT_VERSION_MAJOR = 9
-PRODUCT_VERSION_MINOR = 0
-PRODUCT_VERSION_MAINTENANCE = 0-RC0
-
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=ITL41D
-
-ifdef CM_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
-else
-    ifdef CM_RELEASE
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
-    else
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
-    endif
-endif
-