commit def634690cfb35be6feda2b48645a4f684b4f5e7
author Ricardo Cerqueira <cyanogenmod@cerqueira.org> Thu Jan 09 10:48:59 2014 +0000
committer Gerrit Code Review <gerrit@cyanogenmod.org> Thu Jan 09 10:48:59 2014 +0000
tree 09c9fc68eda99a6bedc667245700aefb8b12bd04
parent 4616137915b522adba5abddea5e491dd3274065e
parent 4dd9c554da8762f1494d6eecf7608fa6c7d6b4b9

Merge "Remove proxy and port on APN 3 Indonesia" into cm-11.0

CONTRIBUTORS.mkdn

diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index beac60d..4608f57 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -68,7 +68,7 @@
 * __Samsung Galaxy S II (AT&T) (SGH-I727):__ topprospect
 * __Samsung Galaxy S II (AT&T) (SGH-I777):__
 * __Samsung Galaxy S II (intl) (GT-I9100):__ codeworkx, Espenfjo
-* __Samsung Galaxy S II (intl) (GT-I9100G):__ codeworkx
+* __Samsung Galaxy S II (intl) (GT-I9100G):__ codeworkx, Jiangyi, Ryuinferno
 * __Samsung Galaxy S III (AT&T) (SGH-I747):__ cyanogen
 * __Samsung Galaxy S III (Cricket) (SCH-R530):__ noobnl
 * __Samsung Galaxy S III (intl) (GT-I9300):__ codeworkx
@@ -88,8 +88,8 @@
 * __Samsung Galaxy S Relay 4G (SGH-T699):__ infernix, lbcoder, nardholio, noptys, teferi (TeamApexQ)
 * __Samsung Galaxy Tab 7" (GSM):__ cdesai, humberos
 * __Samsung Galaxy Tab 7" (CDMA):__ jt1134
-* __Samsung Galaxy Tab 2 7" (GT-P31xx):__ codeworkx
-* __Samsung Galaxy Tab 2 10.1" (GT-P51xx):__ codeworkx
+* __Samsung Galaxy Tab 2 7" (GT-P31xx):__ codeworkx, codyf86
+* __Samsung Galaxy Tab 2 10.1" (GT-P51xx):__ codeworkx, codyf86
 * __Samsung Vibrant (SGH-T959):__ FaultException
 * __Sony Xperia SP (huashan):__ jerpelea, Kali- (FreeXperia team), adfad666, uberlaggydarwin
 * __Sony Xperia T (mint):__ jerpelea, Kali- (FreeXperia team), codeworkx, cdesai, tilal6991

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 7f6f64b..91dcd7d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -295,6 +295,26 @@
 
 -include vendor/cm-priv/keys/keys.mk
 
+CM_DISPLAY_VERSION := $(CM_VERSION)
+
+ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
+  ifneq ($(CM_BUILDTYPE), UNOFFICIAL)
+    ifndef TARGET_VENDOR_RELEASE_BUILD_ID
+      ifneq ($(CM_EXTRAVERSION),)
+        TARGET_VENDOR_RELEASE_BUILD_ID := $(CM_EXTRAVERSION)
+      else
+        TARGET_VENDOR_RELEASE_BUILD_ID := -$(shell date -u +%Y%m%d)
+      endif
+    else
+      TARGET_VENDOR_RELEASE_BUILD_ID := -$(TARGET_VENDOR_RELEASE_BUILD_ID)
+    endif
+    CM_DISPLAY_VERSION=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(TARGET_VENDOR_RELEASE_BUILD_ID)
+  endif
+endif
+
+PRODUCT_PROPERTY_OVERRIDES += \
+  ro.cm.display.version=$(CM_DISPLAY_VERSION)
+
 -include $(WORKSPACE)/hudson/image-auto-bits.mk
 
 -include vendor/cyngn/product.mk