OSDN Git Service

resolved conflicts for merge of 456a2b86 to master
authorEric Fischer <enf@google.com>
Mon, 25 Jan 2010 19:06:44 +0000 (11:06 -0800)
committerEric Fischer <enf@google.com>
Mon, 25 Jan 2010 19:06:44 +0000 (11:06 -0800)
commit4ce3f024535850966e36a73aa9c900f4fb858532
tree165f3b8cd71e63ef63b3a25a0792ed687fa4b000
parent291a4130541885f34ddb2398ba6218596c3851c9
parent456a2b86298bb0b6a845683985f8bd625805be51
resolved conflicts for merge of 456a2b86 to master
res/values/strings.xml