Merge branch 'gingerbread' of github.com:/CyanogenMod/android_device_samsung_galaxys2 into HEAD

Conflicts:
	galaxys2.mk

BoardConfig.mk

@@ -39,7 +39,7 @@ TARGET_NO_RADIOIMAGE := true
 
 TARGET_PROVIDES_INIT := true
 TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_BOARD_PLATFORM := smdkc210
+TARGET_BOARD_PLATFORM := smdkv310
 TARGET_BOOTLOADER_BOARD_NAME := GT-I9100
 TARGET_RECOVERY_INITRC := device/samsung/c1-common/recovery.rc
 

galaxys2.mk

@@ -56,12 +56,6 @@ PRODUCT_COPY_FILES += \
 	frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
 	packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
 
-# Libs
-PRODUCT_PACKAGES := \
-    gps.GT-I9100 \
-    sensors.GT-I9100 \
-    lights.GT-I9100
-
 # The OpenGL ES API level that is natively supported by this device.
 # This is a 16.16 fixed point number
 PRODUCT_PROPERTY_OVERRIDES := \