Jimmy Shih 7b800914f6 merge heads

2012-04-09 14:07:57 -07:00

..

arrays_do_not_translate.xml

merge heads

2012-04-04 16:40:41 -07:00

colors.xml

merge heads

2012-04-04 16:40:41 -07:00

do_not_translate.xml

merge heads

2012-04-04 16:40:41 -07:00

keys.xml

merge heads

2012-04-04 16:40:41 -07:00

plurals.xml

merge heads

2012-04-04 16:40:41 -07:00

strings.xml

merge heads

2012-04-09 14:07:57 -07:00

styles.xml

merge heads

2012-04-09 14:07:57 -07:00