commit 4ed4249ccd9de8f34a7d59ab48b28494ff942d53
author Alan Viverette <alanv@google.com> Sat Oct 11 02:49:47 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 11 02:49:47 2014 +0000
tree 4bc396fb0f345a42efd372806b69cc76f613c18a
parent 5c340458fdebc191d70f33913594e9e3429fc5d2
parent 87b151c65090dfbfcfe09c884377cedd7fd3a34b

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

* commit '87b151c65090dfbfcfe09c884377cedd7fd3a34b':
  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>