Svetoslav 518fb915d2 resolved conflicts for merge of 93e12a7c to master ...

Change-Id: I94b488bdfce77c5f0708f5ccdced6800aa939785

2013-10-10 19:24:32 -07:00

..

arrays.xml

resolved conflicts for merge of 92aa5f4e to klp-dev-plus-aosp

2013-10-10 19:17:27 -07:00

donottranslate.xml

…

strings.xml

Import translations. DO NOT MERGE

2013-10-07 09:23:18 -07:00