Jimmy Shih ce65213d33 merge heads

2012-03-22 17:02:28 -07:00

..

arrays_do_not_translate.xml

merge heads

2012-03-22 17:02:28 -07:00

colors.xml

merge heads

2012-03-22 17:02:28 -07:00

do_not_translate.xml

merge heads

2012-03-22 17:02:28 -07:00

keys.xml

merge heads

2012-03-22 17:02:28 -07:00

navigation_icons.xml

merge heads

2012-03-22 17:02:28 -07:00

plurals.xml

merge heads

2012-03-22 17:02:28 -07:00

strings.xml

merge heads

2012-03-22 17:02:28 -07:00

styles.xml

merge heads

2012-03-22 17:02:28 -07:00