commit 3f21671e4a585e1e00794e3c00e89a8697dc74d2
author Roozbeh Pournader <roozbeh@google.com> Thu Jun 04 23:59:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 04 23:59:50 2015 +0000
tree 78f46d8d2b7056df903534481949160bb2950734
parent 01f77af0480a07e1a6420d9d9d7efaa52b5a933d
parent 946e869807126f0de680db7126d512d740995a2b

am 946e8698: am 73d2f160: Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev

* commit '946e869807126f0de680db7126d512d740995a2b':
  Move NotoSansSymbols higher than CJK in the fallback chain.

data/fonts/fallback_fonts.xml

diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 5857de0..55c000c 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -407,6 +407,11 @@
     </family>
     <family>
         <fileset>
+            <file>NotoSansSymbols-Regular-Subsetted.ttf</file>
+        </fileset>
+    </family>
+    <family>
+        <fileset>
             <file lang="zh-Hans">NotoSansSC-Regular.otf</file>
         </fileset>
     </family>
@@ -432,11 +437,6 @@
     </family>
     <family>
         <fileset>
-            <file>NotoSansSymbols-Regular-Subsetted.ttf</file>
-        </fileset>
-    </family>
-    <family>
-        <fileset>
             <file>NotoColorEmoji.ttf</file>
         </fileset>
     </family>

data/fonts/fonts.xml

diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 62da0ff..dbe81fa 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -331,6 +331,9 @@
     <family>
         <font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
     </family>
+    <family>
+        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
+    </family>
     <family lang="zh-Hans">
         <font weight="400" style="normal">NotoSansSC-Regular.otf</font>
     </family>
@@ -347,9 +350,6 @@
         <font weight="400" style="normal">NanumGothic.ttf</font>
     </family>
     <family>
-        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
-    </family>
-    <family>
         <font weight="400" style="normal">NotoColorEmoji.ttf</font>
     </family>
     <family>