Merge "Change default wallpaper." into jb-mr2-dev
diff --git a/device.mk b/device.mk
index b3446e9..f9e15f4 100644
--- a/device.mk
+++ b/device.mk
@@ -48,6 +48,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
         telephony.lteOnCdmaDevice=0
 
+# These are the hardware-specific features
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
+
 # the actual meat of the device-specific product definition
 $(call inherit-product, device/asus/flo/device-common.mk)