diff options
| author | Koushik Dutta <koushd@gmail.com> | 2011-11-28 07:45:10 -0800 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2011-11-28 07:45:10 -0800 |
| commit | 3c8136b7735c318993335f684c43bd2543d06ec0 (patch) | |
| tree | d2b2ba8ddb7fcf066f7b4fcb78db46b34589e95d | |
| parent | c6f7a490657c093acf82003dd2ff6854615152b3 (diff) | |
| parent | 0051ed6602f5a876f215fc0dd11f217344d68ba0 (diff) | |
| download | vendor_replicant-3c8136b7735c318993335f684c43bd2543d06ec0.zip vendor_replicant-3c8136b7735c318993335f684c43bd2543d06ec0.tar.gz vendor_replicant-3c8136b7735c318993335f684c43bd2543d06ec0.tar.bz2 | |
Merge branch 'ics' of git://github.com/CyanogenMod/android_vendor_cm into ics
Conflicts:
config/common.mk
Change-Id: I6a26a57eda383ffdb51bfe89d4f5ea5dc7602bac
| -rw-r--r-- | config/common.mk | 3 | ||||
| -rw-r--r-- | vendorsetup.sh | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/common.mk b/config/common.mk index 06c2a88..61abb70 100644 --- a/config/common.mk +++ b/config/common.mk @@ -46,7 +46,7 @@ PRODUCT_PACKAGES += \ VideoEditor \ VoiceDialer \ Basic \ - HoloSpiral \ + HoloSpiralWallpaper \ MagicSmoke \ NoiseField \ Galaxy4 \ @@ -74,4 +74,3 @@ else ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG endif endif - diff --git a/vendorsetup.sh b/vendorsetup.sh index f02f023..6cc6242 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -5,4 +5,5 @@ add_lunch_combo cm_p920-userdebug add_lunch_combo cm_p970-userdebug add_lunch_combo cm_p990-userdebug add_lunch_combo cm_p999-userdebug +add_lunch_combo cm_pyramid-userdebug add_lunch_combo cm_smb_a1011-userdebug |