am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."

* commit '3ce2b57d15d4afe330b728c3175b8bfb89c6890a':
  Add casual/cursive/sans-serif-smallcaps font families.
This commit is contained in:
Victoria Lease
2014-03-03 23:46:21 +00:00
committed by Android Git Automerger

View File

@@ -75,7 +75,6 @@
<name>baskerville</name>
<name>goudy</name>
<name>fantasy</name>
<name>cursive</name>
<name>ITC Stone Serif</name>
</nameset>
<fileset>
@@ -108,4 +107,32 @@
</fileset>
</family>
<family>
<nameset>
<name>casual</name>
</nameset>
<fileset>
<file>ComingSoon.ttf</file>
</fileset>
</family>
<family>
<nameset>
<name>cursive</name>
</nameset>
<fileset>
<file>DancingScript-Regular.ttf</file>
<file>DancingScript-Bold.ttf</file>
</fileset>
</family>
<family>
<nameset>
<name>sans-serif-smallcaps</name>
</nameset>
<fileset>
<file>CarroisGothicSC-Regular.ttf</file>
</fileset>
</family>
</familyset>