diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-09-02 12:53:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-02 12:53:58 -0700 |
| commit | 72efdc3c340541b5d9096481b2b3658883f78ab5 (patch) | |
| tree | e3e3208c3a09756d08725a868c4024d078d0d22f /data | |
| parent | 84ba511cb744b3a22bedfcf472cca648895fa72b (diff) | |
| parent | d9facff585b52630203836bf50b873e52a083c24 (diff) | |
| download | frameworks_base-72efdc3c340541b5d9096481b2b3658883f78ab5.zip frameworks_base-72efdc3c340541b5d9096481b2b3658883f78ab5.tar.gz frameworks_base-72efdc3c340541b5d9096481b2b3658883f78ab5.tar.bz2 | |
am d9facff5: Merge "Add Armenian and Georgian fonts"
* commit 'd9facff585b52630203836bf50b873e52a083c24':
Add Armenian and Georgian fonts
Diffstat (limited to 'data')
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 10 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 1bee47a..e468558 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -46,6 +46,16 @@ </family> <family> <fileset> + <file>DroidSansArmenian.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>DroidSansGeorgian.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>Lohit_Hindi.ttf</file> </fileset> </family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 56bd2ce..5bac8f0 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -31,6 +31,8 @@ PRODUCT_COPY_FILES := \ 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 \ frameworks/base/data/fonts/AndroidClock.ttf:system/fonts/AndroidClock.ttf \ frameworks/base/data/fonts/AndroidClock_Highlight.ttf:system/fonts/AndroidClock_Highlight.ttf \ |