summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Russell Brenner <russellbrenner@google.com> 2011-09-23 17:40:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-09-23 17:40:31 -0700
commitdb8d330c65110bf567eb7cbac48451ea4bfd099c (patch)
tree5f62048123756d22abf9260164547a8a7ff0cc9c
parentb410330b2eb1617fe75b2e61995a6987a5172510 (diff)
parenta6ccaa736d18d1ee375162e9df9d2aad8db869e5 (diff)
am a6ccaa73: Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
* commit 'a6ccaa736d18d1ee375162e9df9d2aad8db869e5': Replaced Lohit_Hindi with Lohit-Devanagari
-rw-r--r--CleanSpec.mk1
-rw-r--r--data/fonts/Lohit_Hindi.ttfbin67960 -> 0 bytes
-rw-r--r--data/fonts/fallback_fonts.xml2
-rw-r--r--data/fonts/fonts.mk1
4 files changed, 2 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index d48904c30fdc..7bab94519e61 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -111,6 +111,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/Lohit_Hindi.ttf)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/data/fonts/Lohit_Hindi.ttf b/data/fonts/Lohit_Hindi.ttf
deleted file mode 100644
index 73caae34aac0..000000000000
--- a/data/fonts/Lohit_Hindi.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index e4685589f834..881233a1eb5a 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -56,7 +56,7 @@
</family>
<family>
<fileset>
- <file>Lohit_Hindi.ttf</file>
+ <file>Lohit-Devanagari.ttf</file>
</fileset>
</family>
<family>
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 5bac8f00e479..67d04c914745 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -30,7 +30,6 @@ PRODUCT_COPY_FILES := \
frameworks/base/data/fonts/DroidSerif-Italic.ttf:system/fonts/DroidSerif-Italic.ttf \
frameworks/base/data/fonts/DroidSerif-BoldItalic.ttf:system/fonts/DroidSerif-BoldItalic.ttf \
frameworks/base/data/fonts/DroidSansMono.ttf:system/fonts/DroidSansMono.ttf \
- frameworks/base/data/fonts/Lohit_Hindi.ttf:system/fonts/Lohit_Hindi.ttf \
frameworks/base/data/fonts/DroidSansArmenian.ttf:system/fonts/DroidSansArmenian.ttf \
frameworks/base/data/fonts/DroidSansGeorgian.ttf:system/fonts/DroidSansGeorgian.ttf \
frameworks/base/data/fonts/Clockopia.ttf:system/fonts/Clockopia.ttf \