fixed font family option for preformatted text
Merge branch 'master' into android-1.5