commit 81db2fe78a02c3f01afde9e05f5594c3f2ebb80b
author Alan Viverette <alanv@google.com> Sat Oct 11 04:54:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 11 04:54:56 2014 +0000
tree 641b5f29568d00f20d12987b1a43349bb62db54a
parent 9530280c1bc2b9ac22a3c1db94c76dbcf8a94917
parent 44da5c19dbe7d438e9601477a17041b4a7700631

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

* commit '44da5c19dbe7d438e9601477a17041b4a7700631':
  Add option for serif monospace captioning font

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8e7b6b7..580143e 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>