Update res/xml/about_rom.xml
Update res/xml/about_rom.xml
Merge remote-tracking branch 'xy/jellybean' into franco