summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-09-24 01:41:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-24 01:41:50 -0700
commit407b82a8e0313179f9a12b6e624b50d8a8a1791a (patch)
tree5172a4a593bed688c3f480e080e1e42c8a3546d3 /data
parenta97c5f7779bbd53896b5312c9dd04c505511781d (diff)
parentabdbb5c1e5144e11d72367f79816caaa1dc63f8d (diff)
downloadframeworks_base-407b82a8e0313179f9a12b6e624b50d8a8a1791a.zip
frameworks_base-407b82a8e0313179f9a12b6e624b50d8a8a1791a.tar.gz
frameworks_base-407b82a8e0313179f9a12b6e624b50d8a8a1791a.tar.bz2
am abdbb5c1: am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d' * commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d': Use MOTOYA font for Japanese font
Diffstat (limited to 'data')
-rw-r--r--data/fonts/fonts.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 6bcaaaf..1fd7bba 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -44,5 +44,5 @@
<name>monaco</name>
</font>
<fallback ttf="DroidSansFallback" />
- <fallback ttf="DroidSansJapanese" />
-</fonts> \ No newline at end of file
+ <fallback ttf="MTLmr3m" />
+</fonts>