OSDN Git Service

resolve conflicts for merge of 01b933d to master
authorPatrick Scott <phanna@android.com>
Thu, 17 Sep 2009 13:33:17 +0000 (09:33 -0400)
committerPatrick Scott <phanna@android.com>
Thu, 17 Sep 2009 13:33:17 +0000 (09:33 -0400)
commit6b6541190580a403231381371297e874bf31b8fe
tree56143373892e6e9f65808c3d1222dde3b2289528
parentafb5dbf4355da5426dfdeb45272f9e19a5bc20fe
parent01b93dd5ec611e94e68448afda543399613a6226
resolve conflicts for merge of 01b933d to master
20 files changed:
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-ru/strings.xml
res/values-sv/strings.xml
res/values-tr/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml