summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-11-02 02:10:26 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-11-03 10:50:45 -0800
commit6056e46534c0570a1871c5e64e7067298f9090f0 (patch)
tree48e48dd5c67625c62bc673b4e87425847bfd6ce2 /target
parentc20c9a3eb850e2b28e8fee1679e7b9bc0bfc8aba (diff)
downloadbuild-6056e46534c0570a1871c5e64e7067298f9090f0.zip
build-6056e46534c0570a1871c5e64e7067298f9090f0.tar.gz
build-6056e46534c0570a1871c5e64e7067298f9090f0.tar.bz2
full_base: Fix mismerge
* Remove property that was mismerged in b3b47f8ecdc8c2657b34d89c3a8f40796a16f1f2 Change-Id: I18be52cc4a167f52150e56859f5139bda09d34e4
Diffstat (limited to 'target')
-rw-r--r--target/product/full_base.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index 2ba2ced..fc6fd5c 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -23,10 +23,6 @@ PRODUCT_PACKAGES := \
libfwdlockengine \
WAPPushManager
-# Additional settings used in all AOSP builds
-PRODUCT_PROPERTY_OVERRIDES := \
- ro.com.android.dateformat=MM-dd-yyyy
-
# Put en_US first in the list, so make it default.
PRODUCT_LOCALES := en_US