Merge "Replace hardware features conf file to be emulator specific" am: afd7f4f453 am: 7be6f4c9fd

am: 7072f50067

Change-Id: I471cae79973e6a0cb13d6c2b2c6eb5de1c23fd74
This commit is contained in:
Pulkit Bhuwalka 2017-02-18 06:21:23 +00:00 committed by android-build-merger
commit 23575449a8

View file

@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
PRODUCT_COPY_FILES := \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
device/generic/goldfish/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)