Jimmy Shih c36a494952 merge heads

2012-03-23 16:26:39 -07:00

..

arrays_do_not_translate.xml

fix comment on f87ee43bcbb1

2012-03-23 13:09:22 -07:00

colors.xml

fix comment on f87ee43bcbb1

2012-03-23 13:09:22 -07:00

do_not_translate.xml

fix comment on f87ee43bcbb1

2012-03-23 13:09:22 -07:00

keys.xml

fix comment on f87ee43bcbb1

2012-03-23 13:09:22 -07:00

navigation_icons.xml

fix comment on f87ee43bcbb1

2012-03-23 13:09:22 -07:00

plurals.xml

fix comment on f87ee43bcbb1

2012-03-23 13:09:22 -07:00

strings.xml

merge heads

2012-03-23 16:26:39 -07:00

styles.xml

merge from main

2012-03-23 14:48:06 -07:00