OSDN Git Service

resolved conflicts for merge of f30a09a7 to master
authorEric Fischer <enf@google.com>
Mon, 13 Jul 2009 23:54:57 +0000 (16:54 -0700)
committerEric Fischer <enf@google.com>
Mon, 13 Jul 2009 23:54:57 +0000 (16:54 -0700)
commitc27dc8fe132f660a3117d13c0025540bc61bbe75
treeb1cc3f80226365553d2efc143118d2ccc6f01c79
parent89811e14c23c7fe6f88a21d13429613b756bce3f
parentf30a09a7d75977793b57bff4829646d4a73f2720
resolved conflicts for merge of f30a09a7 to master
res/values-es-rUS/strings.xml
res/values-ko/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml