Merge 2c1c891570 on remote branch

Change-Id: I76d971effbc49875bf96bd188c0c3db6f37748a6
This commit is contained in:
Linux Build Service Account 2017-06-01 07:29:01 -06:00
commit 07c64557d3

View file

@ -115,7 +115,7 @@ PRODUCT_PACKAGES += android.hardware.media.omx@1.0-impl
# Sensor HAL conf file # Sensor HAL conf file
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/sensors/hals.conf:system/etc/sensors/hals.conf device/qcom/sdm660_64/sensors/hals.conf:vendor/etc/sensors/hals.conf
# WLAN host driver # WLAN host driver
ifneq ($(WLAN_CHIPSET),) ifneq ($(WLAN_CHIPSET),)