From 6056e46534c0570a1871c5e64e7067298f9090f0 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 2 Nov 2015 02:10:26 +0200 Subject: full_base: Fix mismerge * Remove property that was mismerged in b3b47f8ecdc8c2657b34d89c3a8f40796a16f1f2 Change-Id: I18be52cc4a167f52150e56859f5139bda09d34e4 --- target/product/full_base.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'target') 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 -- cgit v1.1