commit 36d4cc8d2b308fd9a0894e6ce160aea2079c1aef
author Victoria Lease <violets@google.com> Fri Sep 06 14:04:18 2013 -0700
committer Victoria Lease <violets@google.com> Wed Sep 11 09:52:29 2013 -0700
tree b078c4b99efc9ec0b632fbde5ecb3f988d248cc4
parent ec7a6ea84578be91e04a54331ea4ca63e7fb69e1

include Padauk in fallback chain

Bug: 10625246
Change-Id: I32530a992beeafe2ee16da36f0dc0a752c647cc6
(cherry picked from commit 5d34e4d679e6237b0d075177d1e365161c684445)

Conflicts:
	data/fonts/fallback_fonts.xml

data/fonts/fallback_fonts.xml

diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index d9170c9..1198aba 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -175,6 +175,12 @@
     </family>
     <family>
         <fileset>
+            <file>Padauk-book.ttf</file>
+            <file>Padauk-bookbold.ttf</file>
+        </fileset>
+    </family>
+    <family>
+        <fileset>
             <file>NotoSansSymbols-Regular.ttf</file>
         </fileset>
     </family>