Jimmy Shih f876b8cab4 merge heads

2012-03-23 12:37:44 -07:00

..

arrays_do_not_translate.xml

fix comments for ad1d456e2a96

2012-03-23 12:35:46 -07:00

colors.xml

fix comments for ad1d456e2a96

2012-03-23 12:35:46 -07:00

do_not_translate.xml

fix comments for ad1d456e2a96

2012-03-23 12:35:46 -07:00

keys.xml

fix comments for ad1d456e2a96

2012-03-23 12:35:46 -07:00

navigation_icons.xml

fix comments for ad1d456e2a96

2012-03-23 12:35:46 -07:00

plurals.xml

fix comments for ad1d456e2a96

2012-03-23 12:35:46 -07:00

strings.xml

fix comments for ad1d456e2a96

2012-03-23 12:35:46 -07:00

styles.xml

merge heads

2012-03-23 12:37:44 -07:00