am 33d1c27e: am 087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev

* commit '33d1c27e1dc8bf0617cc333a9a33377d8793f2dd':
  Rename Noto Han fonts to their latest names.
This commit is contained in:
Roozbeh Pournader
2015-05-01 17:10:46 +00:00
committed by Android Git Automerger
2 changed files with 4 additions and 4 deletions

View File

@@ -402,12 +402,12 @@
</family>
<family>
<fileset>
<file lang="zh-Hans">NotoSansHans-Regular.otf</file>
<file lang="zh-Hans">NotoSansSC-Regular.otf</file>
</fileset>
</family>
<family>
<fileset>
<file lang="zh-Hant">NotoSansHant-Regular.otf</file>
<file lang="zh-Hant">NotoSansTC-Regular.otf</file>
</fileset>
</family>
<family>

View File

@@ -329,10 +329,10 @@
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family>
<family lang="zh-Hans">
<font weight="400" style="normal">NotoSansHans-Regular.otf</font>
<font weight="400" style="normal">NotoSansSC-Regular.otf</font>
</family>
<family lang="zh-Hant">
<font weight="400" style="normal">NotoSansHant-Regular.otf</font>
<font weight="400" style="normal">NotoSansTC-Regular.otf</font>
</family>
<family lang="ja">
<font weight="400" style="normal">NotoSansJP-Regular.otf</font>