Fixed errors brought by merging Garret and My String.xml
Merge pull request #135 from mhotan/master

Fixed the compilation errors brought by String.xml