summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-10-11 04:55:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-11 04:55:33 +0000
commit63cea7b23020f7e86532429e116a7208fe87f35a (patch)
tree77cfa560f598f8d4647a63fd6b6960cc45393dc5 /target
parentddb60cbbc324baf5e6ea2195698f86fa7e17946e (diff)
parenta6f16533e23aa287bbeddb025d1166d3f35f1563 (diff)
downloadbuild-63cea7b23020f7e86532429e116a7208fe87f35a.zip
build-63cea7b23020f7e86532429e116a7208fe87f35a.tar.gz
build-63cea7b23020f7e86532429e116a7208fe87f35a.tar.bz2
am a6f16533: am 4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
* commit 'a6f16533e23aa287bbeddb025d1166d3f35f1563': Add Cutive Mono to makefiles
Diffstat (limited to 'target')
-rw-r--r--target/product/generic_no_telephony.mk1
-rw-r--r--target/product/sdk_base.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 93c7563..0713db1 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -62,6 +62,7 @@ $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
+$(call inherit-product-if-exists, external/google-fonts/cutive-mono/fonts.mk)
$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index 56eace5..8610169 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -80,6 +80,7 @@ $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
+$(call inherit-product-if-exists, external/google-fonts/cutive-mono/fonts.mk)
$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)