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

This commit is contained in:
Victoria Lease
2013-09-07 00:29:22 +00:00
committed by Android (Google) Code Review

View File

@@ -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>