commit e7d8b55f4c9d3ce1f9212b926f7b08f35ce0f314
author Alan Viverette <alanv@google.com> Sat Oct 11 05:02:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 11 05:02:46 2014 +0000
tree 2c83b15b30603a07f4320e827c4c8556f1632a9c
parent 556ced3741ff94ef7ed14a617156b5b42c218a60
parent 81db2fe78a02c3f01afde9e05f5594c3f2ebb80b

am 81db2fe7: am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '81db2fe78a02c3f01afde9e05f5594c3f2ebb80b':
  Add option for serif monospace captioning font

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ea47ddd..c21cbdb 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -702,8 +702,9 @@
         <item>Default</item>
         <item>Sans-serif</item>
         <item>Sans-serif condensed</item>
+        <item>Sans-serif monospace</item>
         <item>Serif</item>
-        <item>Monospace</item>
+        <item>Serif monospace</item>
         <item>Casual</item>
         <item>Cursive</item>
         <item>Small capitals</item>
@@ -714,8 +715,9 @@
         <item></item>
         <item>sans-serif</item>
         <item>sans-serif-condensed</item>
+        <item>sans-serif-monospace</item>
         <item>serif</item>
-        <item>monospace</item>
+        <item>serif-monospace</item>
         <item>casual</item>
         <item>cursive</item>
         <item>sans-serif-smallcaps</item>