Merge branch 'jellybean' of https://github.com/CyanogenMod/android_ve…

…ndor_cm into jellybean
BobZhome · Nov 13, 2012 · 30d8915 · 30d8915
2 parents b6ca770 + d542274
commit 30d8915
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
@@ -7,6 +7,7 @@ Maintainers (CyanogenMod 10):
 * __Asus EeePad Transformer (TF101):__ Bumble-Bee, EnJens
 * __Asus EeePad Transformer Prime (TF201):__ Bumble-Bee, EnJens
 * __Asus EeePad Transformer Pad TF300T:__ xplodwild
+* __B&N NookColor (encore):__ eyeballer, fattire, keyodi, krylon360, sluo (NookieDevs)
 * __Google Galaxy Nexus:__ , bekit, Bumble-Bee, burnsra, KalimochoAz
 * __Google Nexus S:__ burnsra, KalimochoAz
 * __Google Nexus 7:__ 

diff --git a/config/common.mk b/config/common.mk
@@ -222,3 +222,6 @@ endif
 PRODUCT_PROPERTY_OVERRIDES += \
   ro.cm.version=$(CM_VERSION) \
   ro.modversion=$(CM_VERSION)
+
+
+-include $(WORKSPACE)/hudson/image-auto-bits.mk
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
@@ -4,11 +4,11 @@ else
     # Inherit common CM stuff
     $(call inherit-product, vendor/cm/config/common_full.mk)
 
-# Default ringtone
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=Orion.ogg \
-    ro.config.notification_sound=Deneb.ogg \
-    ro.config.alarm_alert=Hassium.ogg
+    # Default ringtone
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.config.ringtone=Orion.ogg \
+        ro.config.notification_sound=Deneb.ogg \
+        ro.config.alarm_alert=Hassium.ogg
 
     # BT config
     PRODUCT_COPY_FILES += \

diff --git a/jenkins-build-targets b/jenkins-build-targets
@@ -10,6 +10,7 @@ cm_d2spr-userdebug
 cm_d2tmo-userdebug
 cm_d2usc-userdebug
 cm_d2vzw-userdebug
+cm_encore-userdebug
 cm_endeavoru-userdebug
 cm_epicmtd-userdebug
 cm_everest-userdebug