Bartlomiej Niechwiej 3cf77374c4 Fix merge.

2010-10-26 20:19:54 -07:00

..

arrays.xml

Merge with e34329d612571554d6424d5941dfad57e35612a0

2010-10-26 19:39:46 -07:00

strings.xml

Fix merge.

2010-10-26 20:19:54 -07:00