Merge branch 'ics' of git://github.com/CyanogenMod/android_vendor_cm into ics
Conflicts: config/common.mk Change-Id: I6a26a57eda383ffdb51bfe89d4f5ea5dc7602bac
This commit is contained in:
commit
3c8136b773
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user