commit 8a0474a4003c49bab1d1b29767128ce181a5399c
author Iliyan Malchev <malchev@google.com> Mon Jun 10 15:26:05 2013 -0700
committer The Android Automerger <android-build@android.com> Tue Jun 11 18:12:37 2013 -0700
tree 10863db7cf88f97b46d074a31614066fde462173
parent 09dd2b2da69ab6e0ee44596bc354ff6147d2cb22

resolve conflict and cherry-pick b0fc2287a1b0e863b5e2c4202868a0dbcfd79b96

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 3f7fa88..0b1be02 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,3 +50,4 @@
 $(call add-clean-step, rm -rf out/target/product/flo/system/build.prop)
 $(call add-clean-step, rm -rf out/target/product/flo/system/build.prop)
 $(call add-clean-step, rm -rf out/target/product/flo/system/build.prop)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system//build.prop)

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 7e830d4..88bfab7 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -242,9 +242,7 @@
         ro.qc.sensors.wl_dis=true \
         ro.qualcomm.sensors.smd=true
 
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.qualcomm.cabl=1 \
-	hw.cabl.level=Auto
+# PRODUCT_PROPERTY_OVERRIDES += ro.qualcomm.cabl=1 hw.cabl.level=Auto
 
 # Configure libhwui
 PRODUCT_PROPERTY_OVERRIDES += \