Jimmy Shih c98b10c548 merge heads

2012-04-12 13:25:12 -07:00

..

arrays_do_not_translate.xml

merge heads

2012-04-12 13:25:12 -07:00

colors.xml

merge heads

2012-04-12 13:25:12 -07:00

do_not_translate.xml

merge heads

2012-04-12 13:25:12 -07:00

keys.xml

merge heads

2012-04-12 13:25:12 -07:00

plurals.xml

merge heads

2012-04-12 13:25:12 -07:00

strings.xml

merge heads

2012-04-12 13:25:12 -07:00

styles.xml

merge heads

2012-04-12 13:25:12 -07:00