Jimmy Shih 887c4e3dd1 merge heads

2012-03-20 11:11:26 -07:00

..

arrays_do_not_translate.xml

Fix comment for 01e7f3b54cbf

2012-03-20 10:18:55 -07:00

colors.xml

Fix comment for 01e7f3b54cbf

2012-03-20 10:18:55 -07:00

do_not_translate.xml

merge heads

2012-03-20 10:23:19 -07:00

keys.xml

Fix comment for 01e7f3b54cbf

2012-03-20 10:18:55 -07:00

navigation_icons.xml

Fix comment for 01e7f3b54cbf

2012-03-20 10:18:55 -07:00

plurals.xml

Fix comment for 01e7f3b54cbf

2012-03-20 10:18:55 -07:00

strings.xml

merge heads

2012-03-20 11:11:26 -07:00

styles.xml

Fix Android Lint warnings.

2012-03-19 16:23:14 -07:00