OSDN Git Service

am 81db2fe7: am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option...
authorAlan Viverette <alanv@google.com>
Sat, 11 Oct 2014 05:02:46 +0000 (05:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 11 Oct 2014 05:02:46 +0000 (05:02 +0000)
commite7d8b55f4c9d3ce1f9212b926f7b08f35ce0f314
tree2c83b15b30603a07f4320e827c4c8556f1632a9c
parent556ced3741ff94ef7ed14a617156b5b42c218a60
parent81db2fe78a02c3f01afde9e05f5594c3f2ebb80b
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