Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a31163 authored by Victoria Lease's avatar Victoria Lease
Browse files

resolved conflicts for merge of 5d34e4d6 to klp-dev-plus-aosp

Change-Id: I101085c64af7220bc1e546b83fa1fc16783393be
parents 5e8f5fd2 5d34e4d6
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -173,6 +173,12 @@
            <file>NanumGothic.ttf</file>
        </fileset>
    </family>
    <family>
        <fileset>
            <file>Padauk-book.ttf</file>
            <file>Padauk-bookbold.ttf</file>
        </fileset>
    </family>
    <family>
        <fileset>
            <file>NotoSansSymbols-Regular.ttf</file>