Jimmy Shih 2d05ff98ca merge heads

2012-04-02 14:49:12 -07:00

..

arrays_do_not_translate.xml

merge heads

2012-03-22 12:11:21 -07:00

colors.xml

merge heads

2012-03-22 12:11:21 -07:00

do_not_translate.xml

merge heads

2012-03-22 12:11:21 -07:00

keys.xml

merge heads

2012-03-22 12:11:21 -07:00

navigation_icons.xml

merge heads

2012-03-22 12:11:21 -07:00

plurals.xml

merge heads

2012-03-22 12:11:21 -07:00

strings.xml

merge heads

2012-04-02 14:49:12 -07:00

styles.xml

merge heads

2012-03-22 12:11:21 -07:00