am a7acb4b9: Merge "Fix for bug 7467609 Bad rendering of Telugu text" into jb-mr1.1-dev

* commit 'a7acb4b9cdbf39b3456bd45ef82681716e1ab2f8':
  Fix for bug 7467609 Bad rendering of Telugu text
This commit is contained in:
Raph Levien
2012-12-04 16:32:09 -08:00
committed by Android Git Automerger

View File

@@ -101,6 +101,11 @@
<file>AndroidEmoji.ttf</file> <file>AndroidEmoji.ttf</file>
</fileset> </fileset>
</family> </family>
<family>
<fileset>
<file>Lohit-Telugu.ttf</file>
</fileset>
</family>
<family> <family>
<fileset> <fileset>
<file>DroidSansFallback.ttf</file> <file>DroidSansFallback.ttf</file>
@@ -111,13 +116,10 @@
<file lang="ja">MTLmr3m.ttf</file> <file lang="ja">MTLmr3m.ttf</file>
</fileset> </fileset>
</family> </family>
<!-- <!-- Note: complex scripts (i.e. those requiring shaping in Harfbuzz) have
Fonts below this point have problematic glyphs and should not be moved a cumulative limit of 64k glyphs. Thus, if they are placed after the
higher in the fallback list until those glyphs have been fixed. large fonts such as DroidSansFallback, they are likely to render
incorrectly. Please use caution when putting fonts toward the end of
the list.
--> -->
<family>
<fileset>
<file>Lohit-Telugu.ttf</file> <!-- masks U+FFBC-10007 -->
</fileset>
</family>
</familyset> </familyset>