Svetoslav 1b967a1b23 resolved conflicts for merge of 9358d98d to master ...

Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3

2013-11-13 18:43:32 -08:00

..

arrays.xml

am 852a8895: am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev

2013-11-13 14:27:54 -08:00

donottranslate.xml

…

strings.xml

Import translations. DO NOT MERGE

2013-11-11 08:12:59 -08:00