commit f26c96edc5ce0d67f9dc35c95eea91ab92ea9c64
author Justin Koh <justinkoh@google.com> Tue Feb 11 11:25:37 2014 -0800
committer Justin Koh <justinkoh@google.com> Tue Feb 11 11:26:14 2014 -0800
tree fbf7e3629351cbae3f8742b52d14a9f80e528094
parent 60250d42a11a6e97366843d4940cde2c010027fa
parent 34cb64607737562e25afdf08680886856d7ff668

resolved conflicts for merge of 34cb6460 to master

Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 2707490..2e84ed6 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -89,8 +89,6 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.carrier=unknown
 
-MINIMAL_FONT_FOOTPRINT := true
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)