Jimmy Shih 6bb87e1db9 merge heads

2012-01-28 16:13:12 -08:00

..

arrays_do_not_translate.xml

Merge to head

2012-01-25 21:01:57 -02:00

colors.xml

Initial version of track search. (still lots of TODOs, but works)

2011-11-20 22:50:59 -02:00

do_not_translate.xml

Merge to head

2012-01-25 21:01:57 -02:00

keys.xml

Merge to head

2012-01-25 21:01:57 -02:00

navigation_icons.xml

Initial version of track search. (still lots of TODOs, but works)

2011-11-20 22:50:59 -02:00

plurals.xml

Merge to head

2011-12-06 16:34:48 -02:00

strings.xml

merge heads

2012-01-28 16:13:12 -08:00

styles.xml

Merge to head

2012-01-25 21:01:57 -02:00