OSDN Git Service

Merge commit '5c20034b' into fix
authorMitsuru Oshima <oshima@google.com>
Tue, 21 Jul 2009 06:30:04 +0000 (23:30 -0700)
committerMitsuru Oshima <oshima@google.com>
Tue, 21 Jul 2009 06:30:04 +0000 (23:30 -0700)
commit7f44ca3170abb5b02933d1900b2fccff794bc77c
tree6375d217d165d8d20e8306109fb029751f6b186d
parent3a76bcaa83c15f96832f934e67e6f0190e72a3dc
parent5c20034b7fc9d333c5c2e111a88696606fe0797f
Merge commit '5c20034b' into fix

Conflicts:

res/values/strings.xml
res/values/strings.xml