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

* commit '87b151c65090dfbfcfe09c884377cedd7fd3a34b':
  Add option for serif monospace captioning font
This commit is contained in:
Alan Viverette
2014-10-11 02:49:47 +00:00
committed by Android Git Automerger

View File

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